openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Allow common arch for recovery" am: 53b2427fc9 am: b8c9ba16d6 am: 2a2a01c48d 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I962b93776bc6161c069f93ac7b040158b847a726
This commit is contained in:
Inseob Kim 2021-02-04 08:26:11 +00:00 committed by Automerger Merge Worker
parent 4e153fe708 2a2a01c48d
commit 52bc1bbcb5
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
android/arch.go
View File

@ -647,10 +647,11 @@ func archMutator(bpctx blueprint.BottomUpMutatorContext) {
}
// Recovery is always the primary architecture, filter out any other architectures.
// Common arch is also allowed
if image == RecoveryVariation {
primaryArch := mctx.Config().DevicePrimaryArchType()
targets = filterToArch(targets, primaryArch)
multiTargets = filterToArch(multiTargets, primaryArch)
targets = filterToArch(targets, primaryArch, Common)
multiTargets = filterToArch(multiTargets, primaryArch, Common)
}
// If there are no supported targets disable the module.
@ -719,10 +720,17 @@ func decodeMultilib(base *ModuleBase, class OsClass) (multilib, extraMultilib st
}
// filterToArch takes a list of Targets and an ArchType, and returns a modified list that contains
// only Targets that have the specified ArchType.
func filterToArch(targets []Target, arch ArchType) []Target {
// only Targets that have the specified ArchTypes.
func filterToArch(targets []Target, archs ...ArchType) []Target {
for i := 0; i < len(targets); i++ {
if targets[i].Arch.ArchType != arch {
found := false
for _, arch := range archs {
if targets[i].Arch.ArchType == arch {
found = true
break
}
}
if !found {
targets = append(targets[:i], targets[i+1:]...)
i--
}