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

Merge "Recovery partition uses the first architecture only"

Browse Source 
am: 87e50a0d14

Change-Id: I2da330f2a4062039f83ecb90800e65595982ad32
This commit is contained in:
Jiyong Park
2018-06-19 18:20:35 -07:00
committed by android-build-merger
parent 83cd562ca8 87e50a0d14
commit 48bdb37b4a
1 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
cc/cc.go
View File

@@ -1569,6 +1569,19 @@ func imageMutator(mctx android.BottomUpMutatorContext) {
recoveryVariantNeeded = true recoveryVariantNeeded = true
} }
if recoveryVariantNeeded {
var recoveryMultilib string
if mctx.Config().DevicePrefer32BitExecutables() {
recoveryMultilib = "lib32"
} else {
recoveryMultilib = "lib64"
}
multilib := genrule.Target().Arch.ArchType.Multilib
if multilib != recoveryMultilib {
recoveryVariantNeeded = false
}
}
var variants []string var variants []string
if coreVariantNeeded { if coreVariantNeeded {
variants = append(variants, coreMode) variants = append(variants, coreMode)
@@ -1676,6 +1689,19 @@ func imageMutator(mctx android.BottomUpMutatorContext) {
coreVariantNeeded = false coreVariantNeeded = false
} }
if recoveryVariantNeeded {
var recoveryMultilib string
if mctx.Config().DevicePrefer32BitExecutables() {
recoveryMultilib = "lib32"
} else {
recoveryMultilib = "lib64"
}
multilib := m.Target().Arch.ArchType.Multilib
if multilib != recoveryMultilib {
recoveryVariantNeeded = false
}
}
var variants []string var variants []string
if coreVariantNeeded { if coreVariantNeeded {
variants = append(variants, coreMode) variants = append(variants, coreMode)