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

…main am: 88c21f5 Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2977494 Change-Id: I4f00c169027dd886030404ab7ce00b826e204b72 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
answer35 · Feb 28, 2024 · 54905d0 · 54905d0
2 parents 5855116 + 88c21f5
commit 54905d0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/apex/apex.go b/apex/apex.go
@@ -842,10 +842,12 @@ func (a *apexBundle) DepsMutator(ctx android.BottomUpMutatorContext) {
 		}
 
 		addDependenciesForNativeModules(ctx, deps, target, imageVariation)
-		ctx.AddFarVariationDependencies([]blueprint.Variation{
-			{Mutator: "os", Variation: target.OsVariation()},
-			{Mutator: "arch", Variation: target.ArchVariation()},
-		}, shBinaryTag, a.properties.Sh_binaries...)
+		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

diff --git a/apex/apex_test.go b/apex/apex_test.go
@@ -5046,6 +5046,7 @@ func TestApexWithShBinary(t *testing.T) {
 			key: "myapex.key",
 			sh_binaries: ["myscript"],
 			updatable: false,
+			compile_multilib: "both",
 		}
 
 		apex_key {