Revert "Move some prebuilt build tool configs to Soong"
This reverts commit 3e1c9115d1e53cee4b77adb8e02bf6cb5a2c189a.
Reason for revert: broke builds where makefiles were using M4 without depending upon it
Change-Id: Ib2deef08255656b91cb8ec42f1cb7e9555364f23
diff --git a/core/config.mk b/core/config.mk
index 2863e7d..b928af0 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -587,8 +587,16 @@
# ---------------------------------------------------------------
# Generic tools.
-# These dependencies are now handled via dependencies on prebuilt_build_tool
-BISON_DATA :=$=
+LEX := $(prebuilt_build_tools_bin_noasan)/flex
+# The default PKGDATADIR built in the prebuilt bison is a relative path
+# prebuilts/build-tools/common/bison.
+# To run bison from elsewhere you need to set up enviromental variable
+# BISON_PKGDATADIR.
+BISON_PKGDATADIR := $(prebuilt_build_tools)/common/bison
+BISON := $(prebuilt_build_tools_bin_noasan)/bison
+YACC := $(BISON) -d
+BISON_DATA := $(wildcard $(BISON_PKGDATADIR)/* $(BISON_PKGDATADIR)/*/*)
+M4 :=$= $(prebuilt_build_tools_bin_noasan)/m4
YASM := prebuilts/misc/$(BUILD_OS)-$(HOST_PREBUILT_ARCH)/yasm/yasm
diff --git a/core/main.mk b/core/main.mk
index cb8aa60..f718c9d 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -33,8 +33,6 @@
include $(SOONG_MAKEVARS_MK)
-YACC :=$= $(BISON) -d
-
include $(BUILD_SYSTEM)/clang/config.mk
# Write the build number to a file so it can be read back in