aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiyong Park <jiyong@google.com>2020-04-08 22:37:24 +0900
committerJiyong Park <jiyong@google.com>2020-04-20 16:33:47 +0900
commita1fe6b802f8dd85c43f409bd8158a64d43794410 (patch)
tree7002a92510d0452a315c42ef5b70ea7a67fd1dd6
parentb52966904cf3e71114c70a67f5f16b3210704cf7 (diff)
downloadplatform_external_minijail-a1fe6b802f8dd85c43f409bd8158a64d43794410.tar.gz
platform_external_minijail-a1fe6b802f8dd85c43f409bd8158a64d43794410.tar.bz2
platform_external_minijail-a1fe6b802f8dd85c43f409bd8158a64d43794410.zip
Set apex_available property
The marked library(ies) were available to the APEXes 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: cherry-pick from AOSP Bug: 150999716 Test: m Merged-In: Iddee254c1570bcd0fc9068c970ebee27a85903f2 (cherry picked from commit e3a5cae1bf7d26d7c598e3ff23008963208e9bd3) Change-Id: Iddee254c1570bcd0fc9068c970ebee27a85903f2
-rw-r--r--Android.bp30
1 files changed, 30 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index aea2a03a..62b88dc4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -59,6 +59,11 @@ cc_object {
"-Wall",
"-Werror",
],
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.adbd",
+ "com.android.media.swcodec",
+ ],
}
cc_genrule {
@@ -69,6 +74,11 @@ cc_genrule {
cmd: "$(location gen_syscalls.sh) $(in) $(out)",
srcs: [":libminijail_gen_syscall_obj"],
out: ["libsyscalls.c"],
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.adbd",
+ "com.android.media.swcodec",
+ ],
}
cc_object {
@@ -82,6 +92,11 @@ cc_object {
"-Wall",
"-Werror",
],
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.adbd",
+ "com.android.media.swcodec",
+ ],
}
cc_genrule {
@@ -92,6 +107,11 @@ cc_genrule {
cmd: "$(location gen_constants.sh) $(in) $(out)",
srcs: [":libminijail_gen_constants_obj"],
out: ["libconstants.c"],
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.adbd",
+ "com.android.media.swcodec",
+ ],
}
cc_library_static {
@@ -115,6 +135,11 @@ cc_library_static {
],
},
},
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.adbd",
+ "com.android.media.swcodec",
+ ],
}
cc_object {
@@ -191,6 +216,11 @@ cc_library {
],
},
},
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.adbd",
+ "com.android.media.swcodec",
+ ],
}
// Example ASan-ified libminijail shared library for target.