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"

Browse Source 
* changes:
  Remove some apex_available whitelist for the adbd APEX
  Make ndk_prebuilt_* be available to any apex
This commit is contained in:
Treehugger Robot
2020-04-05 09:10:47 +00:00
committed by Gerrit Code Review
parent ab768cf54b 3a0db5ef4e
commit b9e4a3fdf4
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

@@ -94,16 +94,9 @@ func makeApexAvailableWhitelist() map[string][]string {
// Module separator // Module separator
// //
m["com.android.adbd"] = []string{ m["com.android.adbd"] = []string{
"adbd",
"libadbconnection_server",
"libadbd",
"libadbd_auth", "libadbd_auth",
"libadbd_core",
"libadbd_services",
"libasyncio",
"libbuildversion", "libbuildversion",
"libcap", "libcap",
"libdiagnose_usb",
"libmdnssd", "libmdnssd",
"libminijail", "libminijail",
"libminijail_gen_constants", "libminijail_gen_constants",
@@ -114,7 +107,6 @@ func makeApexAvailableWhitelist() map[string][]string {
"libpackagelistparser", "libpackagelistparser",
"libpcre2", "libpcre2",
"libprocessgroup_headers", "libprocessgroup_headers",
"libqemu_pipe",
} }
// //
// Module separator // Module separator
@@ -819,22 +811,6 @@ func makeApexAvailableWhitelist() map[string][]string {
"libprofile-extras", "libprofile-extras",
"libprofile-extras_ndk", "libprofile-extras_ndk",
"libunwind_llvm", "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 return m
} }

10
cc/ndk_prebuilt.go
View File

@@ -90,6 +90,11 @@ func (c *ndkPrebuiltObjectLinker) link(ctx ModuleContext, flags Flags,
return ndkPrebuiltModuleToPath(ctx, flags.Toolchain, objectExtension, ctx.sdkVersion()) return ndkPrebuiltModuleToPath(ctx, flags.Toolchain, objectExtension, ctx.sdkVersion())
} }
func (*ndkPrebuiltObjectLinker) availableFor(what string) bool {
// ndk prebuilt objects are available to everywhere
return true
}
type ndkPrebuiltStlLinker struct { type ndkPrebuiltStlLinker struct {
*libraryDecorator *libraryDecorator
} }
@@ -103,6 +108,11 @@ func (*ndkPrebuiltStlLinker) linkerDeps(ctx DepsContext, deps Deps) Deps {
return deps return deps
} }
func (*ndkPrebuiltStlLinker) availableFor(what string) bool {
// ndk prebuilt objects are available to everywhere
return true
}
// ndk_prebuilt_shared_stl exports a precompiled ndk shared standard template // ndk_prebuilt_shared_stl exports a precompiled ndk shared standard template
// library (stl) library for linking operation. The soong's module name format // library (stl) library for linking operation. The soong's module name format
// is ndk_<NAME>.so where the library is located under // is ndk_<NAME>.so where the library is located under