Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7431abf authored by Jiyong Park's avatar Jiyong Park Committed by Android (Google) Code Review
Browse files

Merge changes from topic "apex_available_art" into rvc-dev 

* changes:
  Remove apex_available whitelist for the ART APEX
  DO NOT MERGE: Revert "DO NOT MERGE: Remove AppSearch from Android R."
parents 0feed89b be6e2b6a

apex/apex.go

+3 −59
Original line number Diff line number Diff line
@@ -92,66 +92,10 @@ 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.appsearch"] = []string{

		"icing-java-proto-lite",

		"libprotobuf-java-lite",

	}

	m["com.android.art.debug"] = artApexContents

	m["com.android.art.release"] = artApexContents

	//

	// Module separator

	//