commit 8f26b16e276495bde17f8142f29261058b97cbd9
author Treehugger Robot <treehugger-gerrit@google.com> Fri Sep 11 14:46:17 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Sep 11 14:46:17 2020 +0000
tree 38e1ad4f596dad7320fa02f29bd9bb22c511737c
parent 69406c2a7b408e04d5714e50dc342ccb71f4cb13
parent 6a20a31b1579bbe077908a8db038aaee63b6f7db

Merge "Disable prebuilt_build_tools for non-x86 targets" am: 76e661382e am: 6a20a31b15

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

Change-Id: Iedef77aaf1ad3be8ad772f001a4ed51a19c9c6de

Android.bp

diff --git a/Android.bp b/Android.bp
index 910290a..aff7f2a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,6 +12,12 @@
     name: "bison",
     deps: ["common/bison/**/*"],
     export_to_make_var: "BISON",
+    enabled: false,
+    arch: {
+        x86_64: {
+            enabled: true,
+        },
+    },
     target: {
         darwin: {
             src: "darwin-x86/bin/bison",
@@ -27,6 +33,12 @@
 prebuilt_build_tool {
     name: "flex",
     export_to_make_var: "LEX",
+    enabled: false,
+    arch: {
+        x86_64: {
+            enabled: true,
+        },
+    },
     target: {
         darwin: {
             src: "darwin-x86/bin/flex",
@@ -40,6 +52,12 @@
 prebuilt_build_tool {
     name: "m4",
     export_to_make_var: "M4",
+    enabled: false,
+    arch: {
+        x86_64: {
+            enabled: true,
+        },
+    },
     target: {
         darwin: {
             src: "darwin-x86/bin/m4",