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

apex/apex.go

@@ -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

@@ -5046,6 +5046,7 @@ func TestApexWithShBinary(t *testing.T) {
 			key: "myapex.key",
 			sh_binaries: ["myscript"],
 			updatable: false,
+			compile_multilib: "both",
 		}
 
 		apex_key {