commit a37550edd39b3520839251b2a4acceca779a8a8b
author Ying Wang <wangying@google.com> Tue May 06 18:40:59 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 06 18:41:00 2014 +0000
tree 0b85eae9d1b40e85b0958fc662334ad08b884d10
parent 889a93a49582fa17049f0424af3c1c06f70db407
parent fb1236a9a838f150f778101897c5637579cd9e9c

Merge "Use prebuilt flex."

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 9e963d4..86bc0c1 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -351,7 +351,7 @@
 # ---------------------------------------------------------------
 # Generic tools.
 
-LEX := flex
+LEX := prebuilts/misc/$(BUILD_OS)-$(BUILD_ARCH)/flex/flex-2.5.39$(HOST_EXECUTABLE_SUFFIX)
 # The default PKGDATADIR built in the prebuilt bison is a relative path
 # external/bison/data.
 # To run bison from elsewhere you need to set up enviromental variable
@@ -409,8 +409,6 @@
 COLUMN:= column
 endif
 
-OLD_FLEX := prebuilts/misc/$(HOST_PREBUILT_TAG)/flex/flex-2.5.4a$(HOST_EXECUTABLE_SUFFIX)
-
 ifeq ($(HOST_OS),darwin)
 ifeq ($(LEGACY_USE_JAVA6),)
 HOST_JDK_TOOLS_JAR:= $(shell $(BUILD_SYSTEM)/find-jdk-tools-jar.sh)