Remove some apex_available whitelist

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.

Bug: 150999716
Test: m
Change-Id: I91d1b1076733a949ca2a959ba640ce34d0233492
This commit is contained in:
Jiyong Park
2020-03-07 16:35:46 +09:00
parent 85f227eed7
commit 541142ce6b
2 changed files with 25 additions and 182 deletions

View File

@@ -215,6 +215,10 @@ func GatherRequiredDepsForTest(oses ...android.OsType) string {
vendor_available: true,
recovery_available: true,
host_supported: true,
apex_available: [
"//apex_available:platform",
"//apex_available:anyapex",
],
}
cc_library {
name: "libc++",
@@ -243,6 +247,10 @@ func GatherRequiredDepsForTest(oses ...android.OsType) string {
host_supported: false,
vendor_available: true,
recovery_available: true,
apex_available: [
"//apex_available:platform",
"//apex_available:anyapex",
],
}
cc_library {
name: "libunwind_llvm",
@@ -254,8 +262,21 @@ func GatherRequiredDepsForTest(oses ...android.OsType) string {
recovery_available: true,
}
cc_defaults {
name: "crt_defaults",
recovery_available: true,
vendor_available: true,
native_bridge_supported: true,
stl: "none",
apex_available: [
"//apex_available:platform",
"//apex_available:anyapex",
],
}
cc_object {
name: "crtbegin_so",
defaults: ["crt_defaults"],
recovery_available: true,
vendor_available: true,
native_bridge_supported: true,
@@ -264,6 +285,7 @@ func GatherRequiredDepsForTest(oses ...android.OsType) string {
cc_object {
name: "crtbegin_dynamic",
defaults: ["crt_defaults"],
recovery_available: true,
vendor_available: true,
native_bridge_supported: true,
@@ -272,6 +294,7 @@ func GatherRequiredDepsForTest(oses ...android.OsType) string {
cc_object {
name: "crtbegin_static",
defaults: ["crt_defaults"],
recovery_available: true,
vendor_available: true,
native_bridge_supported: true,
@@ -280,6 +303,7 @@ func GatherRequiredDepsForTest(oses ...android.OsType) string {
cc_object {
name: "crtend_so",
defaults: ["crt_defaults"],
recovery_available: true,
vendor_available: true,
native_bridge_supported: true,
@@ -288,6 +312,7 @@ func GatherRequiredDepsForTest(oses ...android.OsType) string {
cc_object {
name: "crtend_android",
defaults: ["crt_defaults"],
recovery_available: true,
vendor_available: true,
native_bridge_supported: true,