From 8b08aea32e9f210ac6a8ec0f5ce763ea0dfde6b2 Mon Sep 17 00:00:00 2001 From: Spandan Das Date: Tue, 14 Mar 2023 19:29:34 +0000 Subject: [PATCH] NDK ABI diffs requires implementation ABI diffs reqiures implementation and cannot be generated from the imoprted .apiimport soong module Test: go test ./cc Change-Id: Ie1da877a5a7d8b984112b64ca7d2c3d4c8d99cb4 --- cc/cc.go | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/cc/cc.go b/cc/cc.go index 0e88c5686..2dc20aed6 100644 --- a/cc/cc.go +++ b/cc/cc.go @@ -2506,20 +2506,11 @@ func (c *Module) DepsMutator(actx android.BottomUpMutatorContext) { if c.isNDKStubLibrary() { // NDK stubs depend on their implementation because the ABI dumps are // 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(), - c.ImageVariation(), - blueprint.Variation{Mutator: "link", Variation: "shared"}, - ), stubImplementation, c.BaseModuleName()) - } + actx.AddFarVariationDependencies(append(ctx.Target().Variations(), + c.ImageVariation(), + blueprint.Variation{Mutator: "link", Variation: "shared"}, + ), stubImplementation, c.BaseModuleName()) } for _, lib := range deps.WholeStaticLibs {