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

Commit d25bb60e authored by Jiyong Park's avatar Jiyong Park
Browse files

Set apex_available property 

The marked library(ies) were available to the adbd APEX via the
hand-written whitelist in build/soong/apex/apex.go. Trying to remove the
whitelist by adding apex_available property to the Android.bp of the
libraries.

Exempt-From-Owner-Approval: already +2'ed by the owner (enh)

Bug: 150999716
Bug: 151398197
Test: m
Change-Id: I8b572e3c4e76bd10c0443a6c08b72e9519243ab5
parent fffdd1ab

adb/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -526,6 +526,7 @@ 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,
@@ -580,6 +581,7 @@ 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

+5 −0
Original line number Diff line number Diff line
@@ -18,6 +18,11 @@ 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

+5 −0
Original line number Diff line number Diff line
@@ -3,6 +3,11 @@ 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

+4 −0
Original line number Diff line number Diff line
@@ -28,6 +28,10 @@ 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

+5 −0
Original line number Diff line number Diff line
@@ -4,6 +4,11 @@ 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"],

    },