Don't use x86 secondary arch for darwin builds am: c2c5b62db3 am: 975df1b262 am: 64cb4bd46e am: d2a37561ba
Original change: https://android-review.googlesource.com/c/platform/prebuilts/build-tools/+/1976710
Change-Id: I302e5b1fca99c6b720fbb7fc9e310bef8597fbca
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": {