Remove apex_available whitelist for the ART APEX
The marked library(ies) were available to the 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: cherry-pick from internal
Bug: 150999716
Test: m
Merged-In: I2b792657b444f0c963e1e92b7c91f6a0cfe1688c
(cherry picked from commit be6e2b6a18
)
Change-Id: I2b792657b444f0c963e1e92b7c91f6a0cfe1688c
This commit is contained in:
parent
bd371b6533
commit
b51e7ea3b8
63
apex/apex.go
63
apex/apex.go
|
@ -93,69 +93,6 @@ func makeApexAvailableWhitelist() map[string][]string {
|
||||||
//
|
//
|
||||||
// Module separator
|
// Module separator
|
||||||
//
|
//
|
||||||
artApexContents := []string{
|
|
||||||
"art_cmdlineparser_headers",
|
|
||||||
"art_disassembler_headers",
|
|
||||||
"art_libartbase_headers",
|
|
||||||
"bionic_libc_platform_headers",
|
|
||||||
"core-repackaged-icu4j",
|
|
||||||
"cpp-define-generator-asm-support",
|
|
||||||
"cpp-define-generator-definitions",
|
|
||||||
"crtbegin_dynamic",
|
|
||||||
"crtbegin_dynamic1",
|
|
||||||
"crtbegin_so1",
|
|
||||||
"crtbrand",
|
|
||||||
"dex2oat_headers",
|
|
||||||
"dt_fd_forward_export",
|
|
||||||
"icu4c_extra_headers",
|
|
||||||
"javavm_headers",
|
|
||||||
"jni_platform_headers",
|
|
||||||
"libPlatformProperties",
|
|
||||||
"libadbconnection_client",
|
|
||||||
"libadbconnection_server",
|
|
||||||
"libandroidicuinit",
|
|
||||||
"libart_runtime_headers_ndk",
|
|
||||||
"libartd-disassembler",
|
|
||||||
"libdexfile_all_headers",
|
|
||||||
"libdexfile_external_headers",
|
|
||||||
"libdexfile_support",
|
|
||||||
"libdmabufinfo",
|
|
||||||
"libexpat",
|
|
||||||
"libfdlibm",
|
|
||||||
"libicui18n_headers",
|
|
||||||
"libicuuc",
|
|
||||||
"libicuuc_headers",
|
|
||||||
"libicuuc_stubdata",
|
|
||||||
"libjdwp_headers",
|
|
||||||
"liblz4",
|
|
||||||
"liblzma",
|
|
||||||
"libmeminfo",
|
|
||||||
"libnativebridge-headers",
|
|
||||||
"libnativehelper_header_only",
|
|
||||||
"libnativeloader-headers",
|
|
||||||
"libnpt_headers",
|
|
||||||
"libopenjdkjvmti_headers",
|
|
||||||
"libperfetto_client_experimental",
|
|
||||||
"libprocinfo",
|
|
||||||
"libunwind_llvm",
|
|
||||||
"libunwindstack",
|
|
||||||
"libv8",
|
|
||||||
"libv8base",
|
|
||||||
"libv8gen",
|
|
||||||
"libv8platform",
|
|
||||||
"libv8sampler",
|
|
||||||
"libv8src",
|
|
||||||
"libvixl",
|
|
||||||
"libvixld",
|
|
||||||
"libz",
|
|
||||||
"libziparchive",
|
|
||||||
"perfetto_trace_protos",
|
|
||||||
}
|
|
||||||
m["com.android.art.debug"] = artApexContents
|
|
||||||
m["com.android.art.release"] = artApexContents
|
|
||||||
//
|
|
||||||
// Module separator
|
|
||||||
//
|
|
||||||
m["com.android.bluetooth.updatable"] = []string{
|
m["com.android.bluetooth.updatable"] = []string{
|
||||||
"android.hardware.audio.common@5.0",
|
"android.hardware.audio.common@5.0",
|
||||||
"android.hardware.bluetooth.a2dp@1.0",
|
"android.hardware.bluetooth.a2dp@1.0",
|
||||||
|
|
Loading…
Reference in New Issue