openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.

Bug: 150999716
Test: m
Merged-In: I11a4e877ee27f7c55e2f00371c6fa58daedb1a9f
Change-Id: I11a4e877ee27f7c55e2f00371c6fa58daedb1a9f
This commit is contained in:
Jiyong Park 2020-04-08 22:37:56 +09:00
parent 1b7599d918
commit 71f42846a3
2 changed files with 4 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
apex/apex.go
View File

@ -94,24 +94,6 @@ func makeApexAvailableWhitelist() map[string][]string {
// //
// Module separator // 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{ artApexContents := []string{
"art_cmdlineparser_headers", "art_cmdlineparser_headers",
"art_disassembler_headers", "art_disassembler_headers",
@ -135,14 +117,12 @@ func makeApexAvailableWhitelist() map[string][]string {
"libandroidicuinit", "libandroidicuinit",
"libart_runtime_headers_ndk", "libart_runtime_headers_ndk",
"libartd-disassembler", "libartd-disassembler",
"libasync_safe",
"libdexfile_all_headers", "libdexfile_all_headers",
"libdexfile_external_headers", "libdexfile_external_headers",
"libdexfile_support", "libdexfile_support",
"libdmabufinfo", "libdmabufinfo",
"libexpat", "libexpat",
"libfdlibm", "libfdlibm",
"libgtest_prod",
"libicui18n_headers", "libicui18n_headers",
"libicuuc", "libicuuc",
"libicuuc_headers", "libicuuc_headers",
@ -232,13 +212,10 @@ func makeApexAvailableWhitelist() map[string][]string {
"libevent", "libevent",
"libfmq", "libfmq",
"libg722codec", "libg722codec",
"libgtest_prod",
"libgui_headers", "libgui_headers",
"libmedia_headers", "libmedia_headers",
"libmodpb64", "libmodpb64",
"libosi", "libosi",
"libprocessgroup",
"libprocessgroup_headers",
"libstagefright_foundation_headers", "libstagefright_foundation_headers",
"libstagefright_headers", "libstagefright_headers",
"libstatslog", "libstatslog",
@ -264,9 +241,7 @@ func makeApexAvailableWhitelist() map[string][]string {
// Module separator // Module separator
// //
m["com.android.conscrypt"] = []string{ m["com.android.conscrypt"] = []string{
"boringssl_self_test",
"libnativehelper_header_only", "libnativehelper_header_only",
"unsupportedappusage",
} }
// //
// Module separator // Module separator
@ -284,18 +259,6 @@ func makeApexAvailableWhitelist() map[string][]string {
// //
// Module separator // 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{ m["com.android.neuralnetworks"] = []string{
"android.hardware.neuralnetworks@1.0", "android.hardware.neuralnetworks@1.0",
"android.hardware.neuralnetworks@1.1", "android.hardware.neuralnetworks@1.1",
@ -308,8 +271,6 @@ func makeApexAvailableWhitelist() map[string][]string {
"libarect", "libarect",
"libbuildversion", "libbuildversion",
"libmath", "libmath",
"libprocessgroup",
"libprocessgroup_headers",
"libprocpartition", "libprocpartition",
"libsync", "libsync",
} }
@ -352,7 +313,6 @@ func makeApexAvailableWhitelist() map[string][]string {
"libaacextractor", "libaacextractor",
"libamrextractor", "libamrextractor",
"libarect", "libarect",
"libasync_safe",
"libaudio_system_headers", "libaudio_system_headers",
"libaudioclient", "libaudioclient",
"libaudioclient_headers", "libaudioclient_headers",
@ -406,13 +366,10 @@ func makeApexAvailableWhitelist() map[string][]string {
"libnblog", "libnblog",
"liboggextractor", "liboggextractor",
"libpackagelistparser", "libpackagelistparser",
"libpcre2",
"libpdx", "libpdx",
"libpdx_default_transport", "libpdx_default_transport",
"libpdx_headers", "libpdx_headers",
"libpdx_uds", "libpdx_uds",
"libprocessgroup",
"libprocessgroup_headers",
"libprocinfo", "libprocinfo",
"libsonivox", "libsonivox",
"libspeexresampler", "libspeexresampler",
@ -478,7 +435,6 @@ func makeApexAvailableWhitelist() map[string][]string {
"libFraunhoferAAC", "libFraunhoferAAC",
"libLibGuiProperties", "libLibGuiProperties",
"libarect", "libarect",
"libasync_safe",
"libaudio_system_headers", "libaudio_system_headers",
"libaudioutils", "libaudioutils",
"libaudioutils", "libaudioutils",
@ -492,7 +448,6 @@ func makeApexAvailableWhitelist() map[string][]string {
"libbluetooth-types-header", "libbluetooth-types-header",
"libbufferhub_headers", "libbufferhub_headers",
"libc_scudo", "libc_scudo",
"libcap",
"libcodec2", "libcodec2",
"libcodec2_headers", "libcodec2_headers",
"libcodec2_hidl@1.0", "libcodec2_hidl@1.0",
@ -551,12 +506,6 @@ func makeApexAvailableWhitelist() map[string][]string {
"libmath", "libmath",
"libmedia_codecserviceregistrant", "libmedia_codecserviceregistrant",
"libmedia_headers", "libmedia_headers",
"libminijail",
"libminijail_gen_constants",
"libminijail_gen_constants_obj",
"libminijail_gen_syscall",
"libminijail_gen_syscall_obj",
"libminijail_generated",
"libmpeg2dec", "libmpeg2dec",
"libnativebase_headers", "libnativebase_headers",
"libnativebridge_lazy", "libnativebridge_lazy",
@ -564,8 +513,6 @@ func makeApexAvailableWhitelist() map[string][]string {
"libnativewindow_headers", "libnativewindow_headers",
"libopus", "libopus",
"libpdx_headers", "libpdx_headers",
"libprocessgroup",
"libprocessgroup_headers",
"libscudo_wrapper", "libscudo_wrapper",
"libsfplugin_ccodec_utils", "libsfplugin_ccodec_utils",
"libstagefright_amrnb_common", "libstagefright_amrnb_common",
@ -633,8 +580,6 @@ func makeApexAvailableWhitelist() map[string][]string {
m["com.android.runtime"] = []string{ m["com.android.runtime"] = []string{
"bionic_libc_platform_headers", "bionic_libc_platform_headers",
"libarm-optimized-routines-math", "libarm-optimized-routines-math",
"libasync_safe",
"libasync_safe_headers",
"libc_aeabi", "libc_aeabi",
"libc_bionic", "libc_bionic",
"libc_bionic_ndk", "libc_bionic_ndk",
@ -670,13 +615,11 @@ func makeApexAvailableWhitelist() map[string][]string {
"libdexfile_support", "libdexfile_support",
"libdexfile_support_static", "libdexfile_support_static",
"libdl_static", "libdl_static",
"libgtest_prod",
"libjemalloc5", "libjemalloc5",
"liblinker_main", "liblinker_main",
"liblinker_malloc", "liblinker_malloc",
"liblz4", "liblz4",
"liblzma", "liblzma",
"libprocessgroup_headers",
"libprocinfo", "libprocinfo",
"libpropertyinfoparser", "libpropertyinfoparser",
"libscudo", "libscudo",
@ -690,34 +633,11 @@ func makeApexAvailableWhitelist() map[string][]string {
// //
// Module separator // 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{ m["com.android.tethering"] = []string{
"libnativehelper_compat_libc++", "libnativehelper_compat_libc++",
"android.hardware.tetheroffload.config@1.0", "android.hardware.tetheroffload.config@1.0",
"libcgrouprc", "libcgrouprc",
"libcgrouprc_format", "libcgrouprc_format",
"libprocessgroup",
"libprocessgroup_headers",
"libtetherutilsjni", "libtetherutilsjni",
"libvndksupport", "libvndksupport",
"tethering-aidl-interfaces-java", "tethering-aidl-interfaces-java",
@ -755,8 +675,6 @@ func makeApexAvailableWhitelist() map[string][]string {
"ipmemorystore-aidl-interfaces-java", "ipmemorystore-aidl-interfaces-java",
"ksoap2", "ksoap2",
"libnanohttpd", "libnanohttpd",
"libprocessgroup",
"libprocessgroup_headers",
"libwifi-jni", "libwifi-jni",
"net-utils-services-common", "net-utils-services-common",
"netd_aidl_interface-V2-java", "netd_aidl_interface-V2-java",
@ -784,7 +702,6 @@ func makeApexAvailableWhitelist() map[string][]string {
// Module separator // Module separator
// //
m["com.android.os.statsd"] = []string{ m["com.android.os.statsd"] = []string{
"libprocessgroup_headers",
"libstatssocket", "libstatssocket",
} }
// //

4
cc/libbuildversion/Android.bp
View File

@ -10,4 +10,8 @@ cc_library_static {
enabled: true, enabled: true,
}, },
}, },
apex_available: [
"//apex_available:platform",
"//apex_available:anyapex",
],
} }