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

apex/apex.go

@@ -842,10 +842,12 @@ func (a *apexBundle) DepsMutator(ctx android.BottomUpMutatorContext) {
 		}
 
 		addDependenciesForNativeModules(ctx, deps, target, imageVariation)
-		ctx.AddFarVariationDependencies([]blueprint.Variation{
+		if isPrimaryAbi {
-			{Mutator: "os", Variation: target.OsVariation()},
+			ctx.AddFarVariationDependencies([]blueprint.Variation{
-			{Mutator: "arch", Variation: target.ArchVariation()},
+				{Mutator: "os", Variation: target.OsVariation()},
-		}, shBinaryTag, a.properties.Sh_binaries...)
+				{Mutator: "arch", Variation: target.ArchVariation()},
+			}, shBinaryTag, a.properties.Sh_binaries...)
+		}
 	}
 
 	// Common-arch dependencies come next

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 {