diff options
| author | 2024-02-28 02:37:09 +0000 | |
|---|---|---|
| committer | 2024-02-28 02:37:09 +0000 | |
| commit | 88c21f567f743edc98446571885de75ec674a747 (patch) | |
| tree | d0c2faf4344b37a94ea8c680ee14e3c04bc41d09 | |
| parent | 60bdd05b213952edbe9d4fbc0ae8511109f67555 (diff) | |
| parent | 654461cde90d833c74bca021040b75da403ac13b (diff) | |
Merge "Add sh_binary dependencies to primary abi of the target" into main
| -rw-r--r-- | apex/apex.go | 10 | ||||
| -rw-r--r-- | apex/apex_test.go | 1 |
2 files changed, 7 insertions, 4 deletions
diff --git a/apex/apex.go b/apex/apex.go index 557b9b74c..c6d8234e2 100644 --- 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 index 02dc6e60b..85d1d712a 100644 --- 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 { |