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

Merge "NDK ABI diffs requires implementation"

Browse Source
This commit is contained in:
Spandan Das
2023-03-16 17:02:04 +00:00
committed by Gerrit Code Review
parent addd60c430 8b08aea32e
commit 046bb4b08a
1 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cc/cc.go
View File

@@ -2506,20 +2506,11 @@ 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 actx.AddFarVariationDependencies(append(ctx.Target().Variations(),
if actx.OtherModuleExists(apiImportName) { c.ImageVariation(),
actx.AddFarVariationDependencies(append(ctx.Target().Variations(), blueprint.Variation{Mutator: "link", Variation: "shared"},
c.ImageVariation(), ), stubImplementation, c.BaseModuleName())
blueprint.Variation{Mutator: "link", Variation: "shared"},
), stubImplementation, apiImportName)
} else {
actx.AddFarVariationDependencies(append(ctx.Target().Variations(),
c.ImageVariation(),
blueprint.Variation{Mutator: "link", Variation: "shared"},
), stubImplementation, c.BaseModuleName())
}
} }
for _, lib := range deps.WholeStaticLibs { for _, lib := range deps.WholeStaticLibs {