Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 447a1ead authored by Anna Trostanetski's avatar Anna Trostanetski Committed by Gerrit Code Review
Browse files

Merge "Revert "Set apex_available property""

parents fb0b0d24 56a712f6

adb/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -526,7 +526,6 @@ cc_library { 
    name: "libadbd",

    defaults: ["adbd_defaults", "host_adbd_supported"],

    recovery_available: true,

    apex_available: ["com.android.adbd"],



    // avoid getting duplicate symbol of android::build::getbuildnumber().

    use_version_lib: false,
@@ -581,7 +580,6 @@ cc_binary { 
    defaults: ["adbd_defaults", "host_adbd_supported"],

    stl: "libc++_static",

    recovery_available: true,

    apex_available: ["com.android.adbd"],



    srcs: [

        "daemon/main.cpp",

adb/libs/adbconnection/Android.bp

+0 −5
Original line number Diff line number Diff line
@@ -18,11 +18,6 @@ cc_library { 
    use_version_lib: false,



    recovery_available: true,

    apex_available: [

        "com.android.adbd",

        // TODO(b/151398197) remove the below

        "//apex_available:platform",

    ],

    compile_multilib: "both",

}

diagnose_usb/Android.bp

+0 −5
Original line number Diff line number Diff line
@@ -3,11 +3,6 @@ cc_library_static { 
    cflags: ["-Wall", "-Wextra", "-Werror"],

    host_supported: true,

    recovery_available: true,

    apex_available: [

        "com.android.adbd",

        // TODO(b/151398197) remove the below

        "//apex_available:platform",

    ],

    target: {

        windows: {

            enabled: true,

libasyncio/Android.bp

+0 −4
Original line number Diff line number Diff line
@@ -28,10 +28,6 @@ cc_library { 
    defaults: ["libasyncio_defaults"],

    vendor_available: true,

    recovery_available: true,

    apex_available: [

        "//apex_available:platform",

        "com.android.adbd",

    ],

    host_supported: true,

    srcs: [

        "AsyncIO.cpp",

qemu_pipe/Android.bp

+0 −5
Original line number Diff line number Diff line
@@ -4,11 +4,6 @@ cc_library_static { 
    name: "libqemu_pipe",

    vendor_available: true,

    recovery_available: true,

    apex_available: [

        "com.android.adbd",

        // TODO(b/151398197) remove the below

        "//apex_available:platform",

    ],

    sanitize: {

        misc_undefined: ["integer"],

    },