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.
Exempt-From-Owner-Approval: cherry-pick from AOSP
Bug: 150999716
Test: m
Merged-In: I91d1b1076733a949ca2a959ba640ce34d0233492
(cherry picked from commit 541142ce6b
)
Change-Id: I91d1b1076733a949ca2a959ba640ce34d0233492
This commit is contained in:
@@ -227,6 +227,10 @@ func GatherRequiredDepsForTest(os android.OsType) string {
|
||||
stl: "none",
|
||||
vendor_available: true,
|
||||
recovery_available: true,
|
||||
apex_available: [
|
||||
"//apex_available:platform",
|
||||
"//apex_available:anyapex",
|
||||
],
|
||||
}
|
||||
cc_library {
|
||||
name: "libc++",
|
||||
@@ -254,6 +258,10 @@ func GatherRequiredDepsForTest(os 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",
|
||||
@@ -265,8 +273,21 @@ func GatherRequiredDepsForTest(os 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,
|
||||
@@ -275,6 +296,7 @@ func GatherRequiredDepsForTest(os android.OsType) string {
|
||||
|
||||
cc_object {
|
||||
name: "crtbegin_dynamic",
|
||||
defaults: ["crt_defaults"],
|
||||
recovery_available: true,
|
||||
vendor_available: true,
|
||||
native_bridge_supported: true,
|
||||
@@ -283,6 +305,7 @@ func GatherRequiredDepsForTest(os android.OsType) string {
|
||||
|
||||
cc_object {
|
||||
name: "crtbegin_static",
|
||||
defaults: ["crt_defaults"],
|
||||
recovery_available: true,
|
||||
vendor_available: true,
|
||||
native_bridge_supported: true,
|
||||
@@ -291,6 +314,7 @@ func GatherRequiredDepsForTest(os android.OsType) string {
|
||||
|
||||
cc_object {
|
||||
name: "crtend_so",
|
||||
defaults: ["crt_defaults"],
|
||||
recovery_available: true,
|
||||
vendor_available: true,
|
||||
native_bridge_supported: true,
|
||||
@@ -299,6 +323,7 @@ func GatherRequiredDepsForTest(os android.OsType) string {
|
||||
|
||||
cc_object {
|
||||
name: "crtend_android",
|
||||
defaults: ["crt_defaults"],
|
||||
recovery_available: true,
|
||||
vendor_available: true,
|
||||
native_bridge_supported: true,
|
||||
|
Reference in New Issue
Block a user