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
Merged-In: I8b572e3c4e76bd10c0443a6c08b72e9519243ab5
(cherry picked from commit d25bb60e05
)
Change-Id: I8b572e3c4e76bd10c0443a6c08b72e9519243ab5
This commit is contained in:
parent
a206b8cbf4
commit
137fb1ff1e
5 changed files with 21 additions and 0 deletions
|
@ -498,6 +498,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,
|
||||
|
@ -550,6 +551,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",
|
||||
|
|
|
@ -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",
|
||||
}
|
||||
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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"],
|
||||
},
|
||||
|
|
Loading…
Reference in a new issue