Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54a38c02 authored by Spandan Das's avatar Spandan Das Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I6a08f23e1f96c7d861bb8fe9c1b170873f7cbb91
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 952b720b 046bb4b0

cc/cc.go

+4 −13
Original line number Diff line number Diff line
@@ -2506,21 +2506,12 @@ 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())

	}

	}



	for _, lib := range deps.WholeStaticLibs {

		depTag := libraryDependencyTag{Kind: staticLibraryDependency, wholeStatic: true, reexportFlags: true}