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

Commit 88c21f56 authored by Riya Thakur's avatar Riya Thakur Committed by Gerrit Code Review
Browse files

Merge "Add sh_binary dependencies to primary abi of the target" into main

parents 60bdd05b 654461cd

apex/apex.go

+6 −4
Original line number Diff line number Diff line
@@ -842,11 +842,13 @@ func (a *apexBundle) DepsMutator(ctx android.BottomUpMutatorContext) { 
		}



		addDependenciesForNativeModules(ctx, deps, target, imageVariation)

		if isPrimaryAbi {

			ctx.AddFarVariationDependencies([]blueprint.Variation{

				{Mutator: "os", Variation: target.OsVariation()},

				{Mutator: "arch", Variation: target.ArchVariation()},

			}, shBinaryTag, a.properties.Sh_binaries...)

		}

	}



	// Common-arch dependencies come next

	commonVariation := ctx.Config().AndroidCommonTarget.Variations()

apex/apex_test.go

+1 −0
Original line number Diff line number Diff line
@@ -5046,6 +5046,7 @@ func TestApexWithShBinary(t *testing.T) { 
			key: "myapex.key",

			sh_binaries: ["myscript"],

			updatable: false,

			compile_multilib: "both",

		}



		apex_key {