From fb1236a9a838f150f778101897c5637579cd9e9c Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Mon, 5 May 2014 18:34:57 -0700
Subject: [PATCH] Use prebuilt flex.

Bug: 14446414
Change-Id: I07fe8d7f246de853e5bae17286834268e36d260c
---
 core/config.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/core/config.mk b/core/config.mk
index 4e65049d2..5df9e7663 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -336,7 +336,7 @@ endif
 # ---------------------------------------------------------------
 # 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
@@ -394,8 +394,6 @@ else
 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)