diff options
| author | Jiyong Park <jiyong@google.com> | 2020-03-09 16:24:11 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2020-04-20 16:23:46 +0900 |
| commit | 24eec07f47145c1fbc7696a899726a8b2e3cebe1 (patch) | |
| tree | 83c4834a12d446f3676b34008affbcd27f35adb7 | |
| parent | 2416c2903efdfef56ee20f67a6fe4e098d426825 (diff) | |
| download | build_soong-24eec07f47145c1fbc7696a899726a8b2e3cebe1.tar.gz build_soong-24eec07f47145c1fbc7696a899726a8b2e3cebe1.tar.bz2 build_soong-24eec07f47145c1fbc7696a899726a8b2e3cebe1.zip | |
Make ndk_prebuilt_* be available to any apex
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.
Exempt-From-Owner-Approval: cherry-pick from AOSP
Bug: 150999716
Test: m
Merged-In: I0870afa4c74b4a06ab1273dff84615778561ecc9
(cherry picked from commit e01e228270dff753c7eaf06d3315dac8230b39d3)
Change-Id: I0870afa4c74b4a06ab1273dff84615778561ecc9
| -rw-r--r-- | apex/apex.go | 16 | ||||
| -rw-r--r-- | cc/ndk_prebuilt.go | 10 |
2 files changed, 10 insertions, 16 deletions
diff --git a/apex/apex.go b/apex/apex.go index 9df7f064..4ce9341a 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -790,22 +790,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 } diff --git a/cc/ndk_prebuilt.go b/cc/ndk_prebuilt.go index e849aeea..3a630d2c 100644 --- a/cc/ndk_prebuilt.go +++ b/cc/ndk_prebuilt.go @@ -90,6 +90,11 @@ func (c *ndkPrebuiltObjectLinker) link(ctx ModuleContext, flags Flags, 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 { *libraryDecorator } @@ -103,6 +108,11 @@ func (*ndkPrebuiltStlLinker) linkerDeps(ctx DepsContext, deps Deps) 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 // library (stl) library for linking operation. The soong's module name format // is ndk_<NAME>.so where the library is located under |