commit 64cb4bd46e6fd8efdb8f2e8e6b979f92de0b1458
author Colin Cross <ccross@android.com> Tue Feb 08 23:24:02 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 08 23:24:02 2022 +0000
tree 0b4d499d8c91e8a78c0bac7c6883bb0c3eebe6dc
parent 2db9721f22ae617730b8269ed3244767a0ac4942
parent 975df1b26214505be029b063c58ddc43127a7a43

Don't use x86 secondary arch for darwin builds am: c2c5b62db3 am: 975df1b262

Original change: https://android-review.googlesource.com/c/platform/prebuilts/build-tools/+/1976710

Change-Id: I6053250d21ca582197c86b5048617eedc0994c53

build-prebuilts.sh

diff --git a/build-prebuilts.sh b/build-prebuilts.sh
index 97e6875..a4e7838 100755
--- a/build-prebuilts.sh
+++ b/build-prebuilts.sh
@@ -47,6 +47,11 @@
     esac
 done
 
+secondary_arch=""
+if [[ ${OS} = linux ]]; then
+    secondary_arch="\"HostSecondaryArch\":\"x86\","
+fi
+
 # Use toybox and other prebuilts even outside of the build (test running, go, etc)
 export PATH=${TOP}/prebuilts/build-tools/path/${OS}-x86:$PATH
 
@@ -60,7 +65,7 @@
 {
     "Allow_missing_dependencies": true,
     "HostArch":"x86_64",
-    "HostSecondaryArch":"x86",
+    ${secondary_arch}
     "HostMusl": $use_musl,
     "VendorVars": {
         "cpython3": {
@@ -195,7 +200,7 @@
 {
     "Allow_missing_dependencies": true,
     "HostArch":"x86_64",
-    "HostSecondaryArch":"x86",
+    ${secondary_arch}
     "SanitizeHost": ["address"],
     "VendorVars": {
         "art_module": {