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

Commit 132bb5f8 authored by Jiyong Park's avatar Jiyong Park Committed by Android (Google) Code Review
Browse files

Merge changes from topic "apex_available" into rvc-dev 

* changes:
  adbd: add apex_available and visibility for internal libs.
  Set apex_available property
  Set apex_available property
  Set apex_available property
  Set apex_available property
parents 0970bcf9 d11e67d8

adb/Android.bp

+20 −0
Original line number Diff line number Diff line
@@ -425,6 +425,15 @@ cc_library_static { 
            ],

        }

    },



    apex_available: [

        "//apex_available:platform",

        "com.android.adbd",

    ],

    visibility: [

        "//bootable/recovery/minadbd",

        "//system/core/adb",

    ],

}



cc_library {
@@ -492,12 +501,22 @@ cc_library { 
            ],

        },

    },



    apex_available: [

        "//apex_available:platform",

        "com.android.adbd",

    ],

    visibility: [

        "//system/core/adb",

    ],



}



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,
@@ -550,6 +569,7 @@ cc_binary { 
    defaults: ["adbd_defaults", "host_adbd_supported", "libadbd_binary_dependencies"],

    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",

}

base/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -47,6 +47,10 @@ cc_library_headers { 
            enabled: true,

        },

    },

    apex_available: [

        "//apex_available:anyapex",

        "//apex_available:platform",

    ],

}



cc_defaults {

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",