Skip to content

Commit

Permalink
Set apex_available property
Browse files Browse the repository at this point in the history
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 d25bb60e056b2b68aaeead3025d8024eaf8e8b8d)
Change-Id: I8b572e3c4e76bd10c0443a6c08b72e9519243ab5

Former-commit-id: 137fb1ff1e430e9e86b829b8a89bf06ae3362956
  • Loading branch information
jiyongp committed Apr 20, 2020
1 parent 52c97f4 commit cae2bb7
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 0 deletions.
2 changes: 2 additions & 0 deletions adb/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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",
Expand Down
5 changes: 5 additions & 0 deletions adb/libs/adbconnection/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -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",
}

Expand Down
5 changes: 5 additions & 0 deletions diagnose_usb/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 4 additions & 0 deletions libasyncio/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 5 additions & 0 deletions qemu_pipe/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
},
Expand Down

0 comments on commit cae2bb7

Please sign in to comment.