commit e63201afe5aa4adb7e47986768f26c4346a83985
author Dan Willemsen <dwillemsen@google.com> Thu Jul 23 22:56:52 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 23 22:56:52 2020 +0000
tree 6449ab6294c55758fd4ddd2d7309932ff059f031
parent 1c3bd76077deb1512f4272e355b8cef8ee45aefd
parent cf4ff09c0e0ded6aec85f387abea3c0eb4721ab6

Merge "Revert "Export prebuilt tools to Make"" am: 9fe574e1bf am: 615a36a43d am: cf4ff09c0e

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

Change-Id: Ib6614596d8347a3dc5104fe535de8e8fbf3f1fab

Android.bp

diff --git a/Android.bp b/Android.bp
index 44d7092..43982e4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -11,7 +11,6 @@
 prebuilt_build_tool {
     name: "bison",
     deps: ["common/bison/**/*"],
-    export_to_make_var: "BISON",
     target: {
         darwin: {
             src: "darwin-x86/bin/bison",
@@ -26,7 +25,6 @@
 
 prebuilt_build_tool {
     name: "flex",
-    export_to_make_var: "LEX",
     target: {
         darwin: {
             src: "darwin-x86/bin/flex",
@@ -39,7 +37,6 @@
 
 prebuilt_build_tool {
     name: "m4",
-    export_to_make_var: "M4",
     target: {
         darwin: {
             src: "darwin-x86/bin/m4",