StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "no_whitelisting_apex_available" am: b9e4a3fdf4 am: bf4bc941a2

Browse Source 
Change-Id: Ife369d5943e70b4d5a6836ca19d514dd1c38d658
This commit is contained in:
Treehugger Robot
2020-04-05 09:51:31 +00:00
committed by Automerger Merge Worker
parent c064ad3476 bf4bc941a2
commit 678c8de79c
2 changed files with 10 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
apex/apex.go
View File

@@ -93,16 +93,9 @@ func makeApexAvailableWhitelist() map[string][]string {
// Module separator
//
m["com.android.adbd"] = []string{
"adbd",
"libadbconnection_server",
"libadbd",
"libadbd_auth",
"libadbd_core",
"libadbd_services",
"libasyncio",
"libbuildversion",
"libcap",
"libdiagnose_usb",
"libmdnssd",
"libminijail",
"libminijail_gen_constants",
@@ -113,7 +106,6 @@ func makeApexAvailableWhitelist() map[string][]string {
"libpackagelistparser",
"libpcre2",
"libprocessgroup_headers",
"libqemu_pipe",
}
//
// Module separator
@@ -823,22 +815,6 @@ func makeApexAvailableWhitelist() map[string][]string {
"libprofile-extras",
"libprofile-extras_ndk",
"libunwind_llvm",
"ndk_crtbegin_dynamic.27",
"ndk_crtbegin_so.16",
"ndk_crtbegin_so.19",
"ndk_crtbegin_so.21",
"ndk_crtbegin_so.24",
"ndk_crtbegin_so.27",
"ndk_crtend_android.27",
"ndk_crtend_so.16",
"ndk_crtend_so.19",
"ndk_crtend_so.21",
"ndk_crtend_so.24",
"ndk_crtend_so.27",
"ndk_libandroid_support",
"ndk_libc++_static",
"ndk_libc++abi",
"ndk_libunwind",
}
return m
}