diff options
| author | Jiyong Park <jiyong@google.com> | 2017-08-03 21:22:50 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2017-08-10 14:09:56 +0900 |
| commit | 40350ab4f2a3baaae4324197ff713c1a11105816 (patch) | |
| tree | ba835ad4e834e88e88ebba60d133335c80566679 /cc/cc.go | |
| parent | 88e6f14a6bcc1e755809b07d0a919443fb32a41c (diff) | |
| download | build_soong-40350ab4f2a3baaae4324197ff713c1a11105816.tar.gz build_soong-40350ab4f2a3baaae4324197ff713c1a11105816.tar.bz2 build_soong-40350ab4f2a3baaae4324197ff713c1a11105816.zip | |
List of VNDK-related libs are exported to make
LL-NDK, VNDK-core, VNDK-SP libraries are exported to make as
SOONG_LLNDK_LIBRARIES, SOONG_VNDK_CORE_LIBRARIES, and
SOONG_VNDK_SAMEPROCESS_LIBRARIES. This can be used to auto-generate
ld.config.txt from a template.
Bug: 64013660
Test: BOARD_VNDK_VERSION=current m -j successful
Test: check out/soong/make_vars*.mk and look for SOONG_*_LIBRARIES
Change-Id: I0f4c5d05d9cd28c3fc9fdcca6ce0e6eaeaacbe8d
Diffstat (limited to 'cc/cc.go')
| -rw-r--r-- | cc/cc.go | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -35,6 +35,7 @@ func init() { android.PreDepsMutators(func(ctx android.RegisterMutatorsContext) { ctx.BottomUp("link", linkageMutator).Parallel() + ctx.BottomUp("vndk", vndkMutator).Parallel() ctx.BottomUp("image", vendorMutator).Parallel() ctx.BottomUp("ndk_api", ndkApiMutator).Parallel() ctx.BottomUp("test_per_src", testPerSrcMutator).Parallel() @@ -457,7 +458,7 @@ func (ctx *moduleContextImpl) isVndkSp() bool { // Create source abi dumps if the module belongs to the list of VndkLibraries. func (ctx *moduleContextImpl) createVndkSourceAbiDump() bool { - return ctx.ctx.Device() && (ctx.mod.isVndk() || inList(ctx.baseModuleName(), config.LLndkLibraries())) + return ctx.ctx.Device() && (ctx.mod.isVndk() || inList(ctx.baseModuleName(), llndkLibraries)) } func (ctx *moduleContextImpl) selectedStl() string { @@ -745,7 +746,7 @@ func (c *Module) DepsMutator(actx android.BottomUpMutatorContext) { } else { variantLibs = append(variantLibs, entry+ndkLibrarySuffix) } - } else if ctx.vndk() && inList(entry, config.LLndkLibraries()) { + } else if ctx.vndk() && inList(entry, llndkLibraries) { nonvariantLibs = append(nonvariantLibs, entry+llndkLibrarySuffix) } else { nonvariantLibs = append(nonvariantLibs, entry) @@ -1109,7 +1110,7 @@ func (c *Module) depsToPaths(ctx android.ModuleContext) PathDeps { case sharedDepTag, sharedExportDepTag, lateSharedDepTag: libName := strings.TrimSuffix(name, llndkLibrarySuffix) libName = strings.TrimPrefix(libName, "prebuilt_") - isLLndk := inList(libName, config.LLndkLibraries()) + isLLndk := inList(libName, llndkLibraries) if c.vndk() && (Bool(cc.Properties.Vendor_available) || isLLndk) { libName += vendorSuffix } |