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 "Add first_perfer32 option to compile_multilib" am: 2a4bbb8061 am: d51336b73c 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iadfb264e458384b7ee5be543ecc3c51bcc8e65a2
This commit is contained in:
vichang 2021-02-18 10:43:41 +00:00 committed by Automerger Merge Worker
parent c96569722b d51336b73c
commit 0c85ac3307
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android/arch.go
View File

@ -1609,13 +1609,15 @@ func decodeMultilibTargets(multilib string, targets []Target, prefer32 bool) ([]
} else { } else {
buildTargets = firstTarget(targets, "lib64", "lib32") buildTargets = firstTarget(targets, "lib64", "lib32")
} }
case "first_prefer32":
buildTargets = firstTarget(targets, "lib32", "lib64")
case "prefer32": case "prefer32":
buildTargets = filterMultilibTargets(targets, "lib32") buildTargets = filterMultilibTargets(targets, "lib32")
if len(buildTargets) == 0 { if len(buildTargets) == 0 {
buildTargets = filterMultilibTargets(targets, "lib64") buildTargets = filterMultilibTargets(targets, "lib64")
} }
default: default:
return nil, fmt.Errorf(`compile_multilib must be "both", "first", "32", "64", or "prefer32" found %q`, return nil, fmt.Errorf(`compile_multilib must be "both", "first", "32", "64", "prefer32" or "first_prefer32" found %q`,
multilib) multilib)
} }