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

Merge "NDK ABI diffs requires implementation" am: 046bb4b08a

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2488215

Change-Id: I6a08f23e1f96c7d861bb8fe9c1b170873f7cbb91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Spandan Das
2023-03-16 17:40:03 +00:00
committed by Automerger Merge Worker
parent 952b720b66 046bb4b08a
commit 54a38c029d
1 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cc/cc.go
View File

@@ -2506,21 +2506,12 @@ func (c *Module) DepsMutator(actx android.BottomUpMutatorContext) {
if c.isNDKStubLibrary() { if c.isNDKStubLibrary() {
// NDK stubs depend on their implementation because the ABI dumps are // NDK stubs depend on their implementation because the ABI dumps are
// generated from the implementation library. // generated from the implementation library.
apiImportName := c.BaseModuleName() + multitree.GetApiImportSuffix()
// If original library exists as imported API, set dependency on the imported library
if actx.OtherModuleExists(apiImportName) {
actx.AddFarVariationDependencies(append(ctx.Target().Variations(),
c.ImageVariation(),
blueprint.Variation{Mutator: "link", Variation: "shared"},
), stubImplementation, apiImportName)
} else {
actx.AddFarVariationDependencies(append(ctx.Target().Variations(), actx.AddFarVariationDependencies(append(ctx.Target().Variations(),
c.ImageVariation(), c.ImageVariation(),
blueprint.Variation{Mutator: "link", Variation: "shared"}, blueprint.Variation{Mutator: "link", Variation: "shared"},
), stubImplementation, c.BaseModuleName()) ), stubImplementation, c.BaseModuleName())
} }
}
for _, lib := range deps.WholeStaticLibs { for _, lib := range deps.WholeStaticLibs {
depTag := libraryDependencyTag{Kind: staticLibraryDependency, wholeStatic: true, reexportFlags: true} depTag := libraryDependencyTag{Kind: staticLibraryDependency, wholeStatic: true, reexportFlags: true}