commit b5baabe6517e7da8fb40490d8b8b89d0bd54c7f2
author Ying Wang <wangying@google.com> Tue May 06 22:15:54 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 06 22:15:54 2014 +0000
tree 7ac332cadcfa19414bb01cc27a84b15c22db3e5c
parent 80ca4a97e3a413daffc38f3e30c4be2475cebee5
parent 490859563413ef331bf63233d43b8a61d73e0aa8

Merge "Automatically export generated .pb.h files."

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index f2c786b..61f1d79 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -350,7 +350,7 @@
 # ---------------------------------------------------------------
 # Generic tools.
 
-LEX := flex
+LEX := prebuilts/misc/$(BUILD_OS)-$(BUILD_ARCH)/flex/flex-2.5.39
 # 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
@@ -415,8 +415,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)