StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add sh_binary dependencies to primary abi of the target" into main am: 88c21f567f am: 54905d0584

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2977494

Change-Id: Id1e9d3f6173cc58909fa210138c01483e19ef83a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Riya Thakur
2024-02-28 04:09:32 +00:00
committed by Automerger Merge Worker
parent 0978cbbab9 54905d0584
commit ca7baacc90
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apex/apex.go
View File

@@ -841,10 +841,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