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

Make ndk_prebuilt_* be available to any apex

Browse Source 
The NDK prebuilts are implicitly used when building with sdk_version set.
Make the module types be available to any apex so that we don't need to
manually add apex_available property to the module definitions manually.

Bug: 150999716
Test: m

Change-Id: I0870afa4c74b4a06ab1273dff84615778561ecc9
This commit is contained in:
Jiyong Park
2020-03-09 16:24:11 +09:00
parent 541142ce6b
commit e01e228270
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apex/apex.go
View File

@@ -819,22 +819,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