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

Merge "Required deps don't track native bridge architectures" into main am: a03e16f1b9

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

Change-Id: I72e6bb88e1a66b604a9ccc59d84a664bcbce0fea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jiyong Park
2024-05-29 04:20:24 +00:00
committed by Automerger Merge Worker
parent b18a30edde a03e16f1b9
commit 1d6f33918d
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android/module.go
View File

@@ -1076,6 +1076,12 @@ func addRequiredDeps(ctx BottomUpMutatorContext) {
return return
} }
// ... also don't make a dependency between native bridge arch and non-native bridge
// arches. b/342945184
if ctx.Target().NativeBridge != target.NativeBridge {
return
}
variation := target.Variations() variation := target.Variations()
if ctx.OtherModuleFarDependencyVariantExists(variation, depName) { if ctx.OtherModuleFarDependencyVariantExists(variation, depName) {
ctx.AddFarVariationDependencies(variation, RequiredDepTag, depName) ctx.AddFarVariationDependencies(variation, RequiredDepTag, depName)