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

Commit 5088a2cb authored by Jiyong Park's avatar Jiyong Park
Browse files

Set apex_available property 

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: I11a4e877ee27f7c55e2f00371c6fa58daedb1a9f
(cherry picked from commit 601d31c2)
Change-Id: I11a4e877ee27f7c55e2f00371c6fa58daedb1a9f
parent 73b6c98e

apex/apex.go

+0 −83
Original line number Diff line number Diff line
@@ -92,24 +92,6 @@ func makeApexAvailableWhitelist() map[string][]string { 
	//

	// Module separator

	//

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

		"libadbd_auth",

		"libbuildversion",

		"libcap",

		"libmdnssd",

		"libminijail",

		"libminijail_gen_constants",

		"libminijail_gen_constants_obj",

		"libminijail_gen_syscall",

		"libminijail_gen_syscall_obj",

		"libminijail_generated",

		"libpackagelistparser",

		"libpcre2",

		"libprocessgroup_headers",

	}

	//

	// Module separator

	//

	artApexContents := []string{

		"art_cmdlineparser_headers",

		"art_disassembler_headers",
@@ -133,14 +115,12 @@ func makeApexAvailableWhitelist() map[string][]string { 
		"libandroidicuinit",

		"libart_runtime_headers_ndk",

		"libartd-disassembler",

		"libasync_safe",

		"libdexfile_all_headers",

		"libdexfile_external_headers",

		"libdexfile_support",

		"libdmabufinfo",

		"libexpat",

		"libfdlibm",

		"libgtest_prod",

		"libicui18n_headers",

		"libicuuc",

		"libicuuc_headers",
@@ -230,13 +210,10 @@ func makeApexAvailableWhitelist() map[string][]string { 
		"libevent",

		"libfmq",

		"libg722codec",

		"libgtest_prod",

		"libgui_headers",

		"libmedia_headers",

		"libmodpb64",

		"libosi",

		"libprocessgroup",

		"libprocessgroup_headers",

		"libstagefright_foundation_headers",

		"libstagefright_headers",

		"libstatslog",
@@ -262,9 +239,7 @@ func makeApexAvailableWhitelist() map[string][]string { 
	// Module separator

	//

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

		"boringssl_self_test",

		"libnativehelper_header_only",

		"unsupportedappusage",

	}

	//

	// Module separator
@@ -282,18 +257,6 @@ func makeApexAvailableWhitelist() map[string][]string { 
	//

	// Module separator

	//

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

		"cronet_impl_common_java",

		"cronet_impl_native_java",

		"cronet_impl_platform_java",

		"libcronet.80.0.3986.0",

		"org.chromium.net.cronet",

		"org.chromium.net.cronet.xml",

		"prebuilt_libcronet.80.0.3986.0",

	}

	//

	// Module separator

	//

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

		"android.hardware.neuralnetworks@1.0",

		"android.hardware.neuralnetworks@1.1",
@@ -306,8 +269,6 @@ func makeApexAvailableWhitelist() map[string][]string { 
		"libarect",

		"libbuildversion",

		"libmath",

		"libprocessgroup",

		"libprocessgroup_headers",

		"libprocpartition",

		"libsync",

	}
@@ -350,7 +311,6 @@ func makeApexAvailableWhitelist() map[string][]string { 
		"libaacextractor",

		"libamrextractor",

		"libarect",

		"libasync_safe",

		"libaudio_system_headers",

		"libaudioclient",

		"libaudioclient_headers",
@@ -404,13 +364,10 @@ func makeApexAvailableWhitelist() map[string][]string { 
		"libnblog",

		"liboggextractor",

		"libpackagelistparser",

		"libpcre2",

		"libpdx",

		"libpdx_default_transport",

		"libpdx_headers",

		"libpdx_uds",

		"libprocessgroup",

		"libprocessgroup_headers",

		"libprocinfo",

		"libspeexresampler",

		"libspeexresampler",
@@ -477,7 +434,6 @@ func makeApexAvailableWhitelist() map[string][]string { 
		"libFraunhoferAAC",

		"libLibGuiProperties",

		"libarect",

		"libasync_safe",

		"libaudio_system_headers",

		"libaudioutils",

		"libaudioutils",
@@ -491,7 +447,6 @@ func makeApexAvailableWhitelist() map[string][]string { 
		"libbluetooth-types-header",

		"libbufferhub_headers",

		"libc_scudo",

		"libcap",

		"libcodec2",

		"libcodec2_headers",

		"libcodec2_hidl@1.0",
@@ -550,20 +505,12 @@ func makeApexAvailableWhitelist() map[string][]string { 
		"libmath",

		"libmedia_codecserviceregistrant",

		"libmedia_headers",

		"libminijail",

		"libminijail_gen_constants",

		"libminijail_gen_constants_obj",

		"libminijail_gen_syscall",

		"libminijail_gen_syscall_obj",

		"libminijail_generated",

		"libmpeg2dec",

		"libnativebase_headers",

		"libnativebridge_lazy",

		"libnativeloader_lazy",

		"libnativewindow_headers",

		"libpdx_headers",

		"libprocessgroup",

		"libprocessgroup_headers",

		"libscudo_wrapper",

		"libsfplugin_ccodec_utils",

		"libspeexresampler",
@@ -634,8 +581,6 @@ func makeApexAvailableWhitelist() map[string][]string { 
	m["com.android.runtime"] = []string{

		"bionic_libc_platform_headers",

		"libarm-optimized-routines-math",

		"libasync_safe",

		"libasync_safe_headers",

		"libc_aeabi",

		"libc_bionic",

		"libc_bionic_ndk",
@@ -671,13 +616,11 @@ func makeApexAvailableWhitelist() map[string][]string { 
		"libdexfile_support",

		"libdexfile_support_static",

		"libdl_static",

		"libgtest_prod",

		"libjemalloc5",

		"liblinker_main",

		"liblinker_malloc",

		"liblz4",

		"liblzma",

		"libprocessgroup_headers",

		"libprocinfo",

		"libpropertyinfoparser",

		"libscudo",
@@ -691,34 +634,11 @@ func makeApexAvailableWhitelist() map[string][]string { 
	//

	// Module separator

	//

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

		"dnsresolver_aidl_interface-unstable-ndk_platform",

		"libgtest_prod",

		"libnativehelper_header_only",

		"libnetd_client_headers",

		"libnetd_resolv",

		"libnetdutils",

		"libprocessgroup",

		"libprocessgroup_headers",

		"libstatslog_resolv",

		"libstatspush_compat",

		"libstatssocket",

		"libstatssocket_headers",

		"libsysutils",

		"netd_event_listener_interface-ndk_platform",

		"server_configurable_flags",

		"stats_proto",

	}

	//

	// Module separator

	//

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

		"libnativehelper_compat_libc++",

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

		"libcgrouprc",

		"libcgrouprc_format",

		"libprocessgroup",

		"libprocessgroup_headers",

		"libtetherutilsjni",

		"libvndksupport",

		"tethering-aidl-interfaces-java",
@@ -756,8 +676,6 @@ func makeApexAvailableWhitelist() map[string][]string { 
		"ipmemorystore-aidl-interfaces-java",

		"ksoap2",

		"libnanohttpd",

		"libprocessgroup",

		"libprocessgroup_headers",

		"libwifi-jni",

		"net-utils-services-common",

		"netd_aidl_interface-V2-java",
@@ -785,7 +703,6 @@ func makeApexAvailableWhitelist() map[string][]string { 
	// Module separator

	//

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

		"libprocessgroup_headers",

		"libstatssocket",

	}

	//

cc/libbuildversion/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -10,4 +10,8 @@ cc_library_static { 
            enabled: true,

        },

    },

    apex_available: [

        "//apex_available:platform",

        "//apex_available:anyapex",

    ],

}