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

Commit 2416c290 authored by Jiyong Park's avatar Jiyong Park
Browse files

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 541142ce)
Change-Id: I91d1b1076733a949ca2a959ba640ce34d0233492
parent 39a06440

apex/apex.go

+0 −177
Original line number Diff line number Diff line
@@ -75,26 +75,15 @@ func makeApexAvailableWhitelist() map[string][]string { 
	//

	m["com.android.adbd"] = []string{

		"adbd",

		"bcm_object",

		"fmtlib",

		"libadbconnection_server",

		"libadbd",

		"libadbd_auth",

		"libadbd_core",

		"libadbd_services",

		"libasyncio",

		"libbacktrace_headers",

		"libbase",

		"libbase_headers",

		"libbuildversion",

		"libc++",

		"libcap",

		"libcrypto",

		"libcrypto_utils",

		"libcutils",

		"libcutils_headers",

		"libdiagnose_usb",

		"liblog_headers",

		"libmdnssd",

		"libminijail",

		"libminijail_gen_constants",
@@ -106,8 +95,6 @@ func makeApexAvailableWhitelist() map[string][]string { 
		"libpcre2",

		"libprocessgroup_headers",

		"libqemu_pipe",

		"libsystem_headers",

		"libutils_headers",

	}

	//

	// Module separator
@@ -116,7 +103,6 @@ func makeApexAvailableWhitelist() map[string][]string { 
		"art_cmdlineparser_headers",

		"art_disassembler_headers",

		"art_libartbase_headers",

		"bcm_object",

		"bionic_libc_platform_headers",

		"core-repackaged-icu4j",

		"cpp-define-generator-asm-support",
@@ -128,9 +114,7 @@ func makeApexAvailableWhitelist() map[string][]string { 
		"conscrypt.module.intra.core.api.stubs",

		"dex2oat_headers",

		"dt_fd_forward_export",

		"fmtlib",

		"icu4c_extra_headers",

		"jacocoagent",

		"javavm_headers",

		"jni_platform_headers",

		"libPlatformProperties",
@@ -140,15 +124,6 @@ func makeApexAvailableWhitelist() map[string][]string { 
		"libart_runtime_headers_ndk",

		"libartd-disassembler",

		"libasync_safe",

		"libbacktrace",

		"libbase",

		"libbase_headers",

		"libc++",

		"libc++_static",

		"libc++abi",

		"libc++demangle",

		"libc_headers",

		"libcrypto",

		"libdexfile_all_headers",

		"libdexfile_external_headers",

		"libdexfile_support",
@@ -161,7 +136,6 @@ func makeApexAvailableWhitelist() map[string][]string { 
		"libicuuc_headers",

		"libicuuc_stubdata",

		"libjdwp_headers",

		"liblog_headers",

		"liblz4",

		"liblzma",

		"libmeminfo",
@@ -172,7 +146,6 @@ func makeApexAvailableWhitelist() map[string][]string { 
		"libopenjdkjvmti_headers",

		"libperfetto_client_experimental",

		"libprocinfo",

		"libprotobuf-cpp-lite",

		"libunwind_llvm",

		"libunwindstack",

		"libv8",
@@ -207,13 +180,10 @@ func makeApexAvailableWhitelist() map[string][]string { 
		"android.hidl.token@1.0-utils",

		"avrcp-target-service",

		"avrcp_headers",

		"bcm_object",

		"bluetooth-protos-lite",

		"bluetooth.mapsapi",

		"com.android.vcard",

		"dnsresolver_aidl_interface-V2-java",

		"fmtlib",

		"guava",

		"ipmemorystore-aidl-interfaces-V5-java",

		"ipmemorystore-aidl-interfaces-java",

		"internal_include_headers",
@@ -223,9 +193,6 @@ func makeApexAvailableWhitelist() map[string][]string { 
		"libFraunhoferAAC",

		"libaudio-a2dp-hw-utils",

		"libaudio-hearing-aid-hw-utils",

		"libbacktrace_headers",

		"libbase",

		"libbase_headers",

		"libbinder_headers",

		"libbluetooth",

		"libbluetooth-types",
@@ -247,38 +214,23 @@ func makeApexAvailableWhitelist() map[string][]string { 
		"libbtdevice",

		"libbte",

		"libbtif",

		"libc++",

		"libchrome",

		"libcrypto",

		"libcutils",

		"libcutils_headers",

		"libevent",

		"libfmq",

		"libg722codec",

		"libgtest_prod",

		"libgui_headers",

		"libhidlbase",

		"libhidlbase-impl-internal",

		"libhidltransport-impl-internal",

		"libhwbinder-impl-internal",

		"libjsoncpp",

		"liblog_headers",

		"libmedia_headers",

		"libmodpb64",

		"libosi",

		"libprocessgroup",

		"libprocessgroup_headers",

		"libprotobuf-cpp-lite",

		"libprotobuf-java-lite",

		"libprotobuf-java-micro",

		"libstagefright_foundation_headers",

		"libstagefright_headers",

		"libstatslog",

		"libstatssocket",

		"libsystem_headers",

		"libtinyxml2",

		"libudrv-uipc",

		"libutils_headers",

		"libz",

		"media_plugin_headers",

		"net-utils-services-common",
@@ -298,12 +250,8 @@ func makeApexAvailableWhitelist() map[string][]string { 
	// Module separator

	//

	m["com.android.conscrypt"] = []string{

		"bcm_object",

		"boringssl_self_test",

		"libc++",

		"libcrypto",

		"libnativehelper_header_only",

		"libssl",

		"unsupportedappusage",

	}

	//
@@ -343,27 +291,13 @@ func makeApexAvailableWhitelist() map[string][]string { 
		"android.hidl.memory.token@1.0",

		"android.hidl.memory@1.0",

		"android.hidl.safe_union@1.0",

		"bcm_object",

		"fmtlib",

		"libarect",

		"libbacktrace_headers",

		"libbase",

		"libbase_headers",

		"libbuildversion",

		"libc++",

		"libcutils",

		"libcutils_headers",

		"libhidlbase-impl-internal",

		"libhidltransport-impl-internal",

		"libhwbinder-impl-internal",

		"liblog_headers",

		"libmath",

		"libprocessgroup",

		"libprocessgroup_headers",

		"libprocpartition",

		"libsync",

		"libsystem_headers",

		"libutils_headers",

	}

	//

	// Module separator
@@ -392,9 +326,7 @@ func makeApexAvailableWhitelist() map[string][]string { 
		"android.hidl.memory@1.0",

		"android.hidl.token@1.0",

		"android.hidl.token@1.0-utils",

		"bcm_object",

		"bionic_libc_platform_headers",

		"fmtlib",

		"gl_headers",

		"libEGL",

		"libEGL_blobCache",
@@ -416,23 +348,14 @@ func makeApexAvailableWhitelist() map[string][]string { 
		"libaudiopolicy",

		"libaudioutils",

		"libaudioutils_fixedfft",

		"libbacktrace",

		"libbacktrace_headers",

		"libbase",

		"libbase_headers",

		"libbinder_headers",

		"libbluetooth-types-header",

		"libbufferhub",

		"libbufferhub_headers",

		"libbufferhubqueue",

		"libc++",

		"libc_headers",

		"libc_malloc_debug_backtrace",

		"libcamera_client",

		"libcamera_metadata",

		"libcrypto",

		"libcutils",

		"libcutils_headers",

		"libdexfile_external_headers",

		"libdexfile_support",

		"libdvr_headers",
@@ -444,14 +367,7 @@ func makeApexAvailableWhitelist() map[string][]string { 
		"libgui",

		"libgui_headers",

		"libhardware_headers",

		"libhidlbase",

		"libhidlbase-impl-internal",

		"libhidlmemory",

		"libhidltransport-impl-internal",

		"libhwbinder-impl-internal",

		"libinput",

		"libjsoncpp",

		"liblog_headers",

		"liblzma",

		"libmath",

		"libmedia",
@@ -499,11 +415,9 @@ func makeApexAvailableWhitelist() map[string][]string { 
		"libstagefright_mpeg2extractor",

		"libstagefright_mpeg2support",

		"libsync",

		"libsystem_headers",

		"libui",

		"libui_headers",

		"libunwindstack",

		"libutils_headers",

		"libvibrator",

		"libvorbisidec",

		"libwavextractor",
@@ -545,7 +459,6 @@ func makeApexAvailableWhitelist() map[string][]string { 
		"android.hidl.safe_union@1.0",

		"android.hidl.token@1.0",

		"android.hidl.token@1.0-utils",

		"fmtlib",

		"libEGL",

		"libFLAC",

		"libFLAC-config",
@@ -562,15 +475,10 @@ func makeApexAvailableWhitelist() map[string][]string { 
		"libavcenc",

		"libavservices_minijail",

		"libavservices_minijail",

		"libbacktrace",

		"libbacktrace_headers",

		"libbase",

		"libbase_headers",

		"libbinder_headers",

		"libbinderthreadstateutils",

		"libbluetooth-types-header",

		"libbufferhub_headers",

		"libc++",

		"libc_scudo",

		"libcap",

		"libcodec2",
@@ -610,8 +518,6 @@ func makeApexAvailableWhitelist() map[string][]string { 
		"libcodec2_soft_vp9dec",

		"libcodec2_soft_vp9enc",

		"libcodec2_vndk",

		"libcutils",

		"libcutils_headers",

		"libdexfile_support",

		"libdvr_headers",

		"libfmq",
@@ -627,15 +533,8 @@ func makeApexAvailableWhitelist() map[string][]string { 
		"libhardware_headers",

		"libhevcdec",

		"libhevcenc",

		"libhidlbase",

		"libhidlbase-impl-internal",

		"libhidlmemory",

		"libhidltransport-impl-internal",

		"libhwbinder-impl-internal",

		"libion",

		"libjpeg",

		"libjsoncpp",

		"liblog_headers",

		"liblzma",

		"libmath",

		"libmedia_codecserviceregistrant",
@@ -674,11 +573,9 @@ func makeApexAvailableWhitelist() map[string][]string { 
		"libstagefright_m4vh263enc",

		"libstagefright_mp3dec",

		"libsync",

		"libsystem_headers",

		"libui",

		"libui_headers",

		"libunwindstack",

		"libutils_headers",

		"libvorbisidec",

		"libvpx",

		"libyuv",
@@ -694,7 +591,6 @@ func makeApexAvailableWhitelist() map[string][]string { 
		"MediaProvider",

		"MediaProviderGoogle",

		"fmtlib_ndk",

		"guava",

		"libbase_ndk",

		"libfuse",

		"libfuse_jni",
@@ -718,7 +614,6 @@ func makeApexAvailableWhitelist() map[string][]string { 
		"kotlinx-coroutines-android-nodeps",

		"kotlinx-coroutines-core",

		"kotlinx-coroutines-core-nodeps",

		"libprotobuf-java-lite",

		"permissioncontroller-statsd",

		"GooglePermissionController",

		"PermissionController",
@@ -728,14 +623,9 @@ func makeApexAvailableWhitelist() map[string][]string { 
	//

	m["com.android.runtime"] = []string{

		"bionic_libc_platform_headers",

		"fmtlib",

		"libarm-optimized-routines-math",

		"libasync_safe",

		"libasync_safe_headers",

		"libbacktrace_headers",

		"libbase",

		"libbase_headers",

		"libc++",

		"libc_aeabi",

		"libc_bionic",

		"libc_bionic_ndk",
@@ -749,7 +639,6 @@ func makeApexAvailableWhitelist() map[string][]string { 
		"libc_freebsd",

		"libc_freebsd_large_stack",

		"libc_gdtoa",

		"libc_headers",

		"libc_init_dynamic",

		"libc_init_static",

		"libc_jemalloc_wrapper",
@@ -764,8 +653,6 @@ func makeApexAvailableWhitelist() map[string][]string { 
		"libc_syscalls",

		"libc_tzcode",

		"libc_unwind_static",

		"libcutils",

		"libcutils_headers",

		"libdebuggerd",

		"libdebuggerd_common_headers",

		"libdebuggerd_handler_core",
@@ -778,7 +665,6 @@ func makeApexAvailableWhitelist() map[string][]string { 
		"libjemalloc5",

		"liblinker_main",

		"liblinker_malloc",

		"liblog_headers",

		"liblz4",

		"liblzma",

		"libprocessgroup_headers",
@@ -786,11 +672,9 @@ func makeApexAvailableWhitelist() map[string][]string { 
		"libpropertyinfoparser",

		"libscudo",

		"libstdc++",

		"libsystem_headers",

		"libsystemproperties",

		"libtombstoned_client_static",

		"libunwindstack",

		"libutils_headers",

		"libz",

		"libziparchive",

	}
@@ -798,34 +682,19 @@ func makeApexAvailableWhitelist() map[string][]string { 
	// Module separator

	//

	m["com.android.resolv"] = []string{

		"bcm_object",

		"dnsresolver_aidl_interface-unstable-ndk_platform",

		"fmtlib",

		"libbacktrace_headers",

		"libbase",

		"libbase_headers",

		"libc++",

		"libcrypto",

		"libcutils",

		"libcutils_headers",

		"libgtest_prod",

		"libjsoncpp",

		"liblog_headers",

		"libnativehelper_header_only",

		"libnetd_client_headers",

		"libnetd_resolv",

		"libnetdutils",

		"libprocessgroup",

		"libprocessgroup_headers",

		"libprotobuf-cpp-lite",

		"libssl",

		"libstatslog_resolv",

		"libstatspush_compat",

		"libstatssocket",

		"libstatssocket_headers",

		"libsystem_headers",

		"libsysutils",

		"libutils_headers",

		"netd_event_listener_interface-ndk_platform",

		"server_configurable_flags",

		"stats_proto",
@@ -834,28 +703,13 @@ func makeApexAvailableWhitelist() map[string][]string { 
	// Module separator

	//

	m["com.android.tethering"] = []string{

		"libbase",

		"libc++",

		"libnativehelper_compat_libc++",

		"android.hardware.tetheroffload.config@1.0",

		"fmtlib",

		"libbacktrace_headers",

		"libbase_headers",

		"libcgrouprc",

		"libcgrouprc_format",

		"libcutils",

		"libcutils_headers",

		"libhidlbase",

		"libhidlbase-impl-internal",

		"libhidltransport-impl-internal",

		"libhwbinder-impl-internal",

		"libjsoncpp",

		"liblog_headers",

		"libprocessgroup",

		"libprocessgroup_headers",

		"libsystem_headers",

		"libtetherutilsjni",

		"libutils_headers",

		"libvndksupport",

		"tethering-aidl-interfaces-java",

	}
@@ -891,20 +745,9 @@ func makeApexAvailableWhitelist() map[string][]string { 
		"ipmemorystore-aidl-interfaces-V3-java",

		"ipmemorystore-aidl-interfaces-java",

		"ksoap2",

		"libbacktrace_headers",

		"libbase",

		"libbase_headers",

		"libc++",

		"libcutils",

		"libcutils_headers",

		"liblog_headers",

		"libnanohttpd",

		"libprocessgroup",

		"libprocessgroup_headers",

		"libprotobuf-java-lite",

		"libprotobuf-java-nano",

		"libsystem_headers",

		"libutils_headers",

		"libwifi-jni",

		"net-utils-services-common",

		"netd_aidl_interface-V2-java",
@@ -932,34 +775,14 @@ func makeApexAvailableWhitelist() map[string][]string { 
	// Module separator

	//

	m["com.android.os.statsd"] = []string{

		"libbacktrace_headers",

		"libbase_headers",

		"libc++",

		"libcutils",

		"libcutils_headers",

		"liblog_headers",

		"libprocessgroup_headers",

		"libstatssocket",

		"libsystem_headers",

		"libutils_headers",

	}

	//

	// Module separator

	//

	m["//any"] = []string{

		"crtbegin_dynamic",

		"crtbegin_dynamic1",

		"crtbegin_so",

		"crtbegin_so1",

		"crtbegin_static",

		"crtbrand",

		"crtend_android",

		"crtend_so",

		"libatomic",

		"libc++_static",

		"libc++abi",

		"libc++demangle",

		"libc_headers",

		"libclang_rt",

		"libgcc_stripped",

		"libprofile-clang-extras",

cc/testing.go

+25 −0
Original line number Diff line number Diff line
@@ -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,