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

Commit f4265823 authored by Jiyong Park's avatar Jiyong Park Committed by Automerger Merge Worker
Browse files

ndk_library depends on the correct arch variant of cc_library_headers am: f8fab9b8 

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



Change-Id: I990bab48b4dcdf4493c704080ab414ed5fbbbb3f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0b98048d f8fab9b8

cc/cc.go

+8 −2
Original line number Diff line number Diff line
@@ -2507,8 +2507,14 @@ func (c *Module) DepsMutator(actx android.BottomUpMutatorContext) { 
		}



		if c.isNDKStubLibrary() {

			// ndk_headers do not have any variations

			variationExists := actx.OtherModuleDependencyVariantExists(nil, lib)

			if variationExists {

				actx.AddVariationDependencies(nil, depTag, lib)

			} else {

				// dependencies to ndk_headers fall here as ndk_headers do not have

				// any variants.

				actx.AddFarVariationDependencies([]blueprint.Variation{}, depTag, lib)

			}

		} else if c.IsStubs() && !c.isImportedApiLibrary() {

			actx.AddFarVariationDependencies(append(ctx.Target().Variations(), c.ImageVariation()),

				depTag, lib)