Merge changes from topic "apex_available_art" into rvc-dev am: b7431abffe

Change-Id: Idb9f30b74687f2c5da9494db60ae6614a67c0c4b
This commit is contained in:
Jiyong Park
2020-05-28 01:11:19 +00:00
committed by Automerger Merge Worker

View File

@@ -100,69 +100,6 @@ func makeApexAvailableWhitelist() map[string][]string {
//
// 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{
"android.hardware.audio.common@5.0",
"android.hardware.bluetooth.a2dp@1.0",