diff options
| author | Ying Wang <wangying@google.com> | 2014-05-06 18:46:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-06 18:46:10 +0000 |
| commit | bf4cdb49a3e56b37f8bd2eeeeeb4a72795dcd0a9 (patch) | |
| tree | fb188d7b93d58635018ac1b5b499b22a70facb84 /core/config.mk | |
| parent | 9c7393b87aed5ae6acd97529b05ce26f80627259 (diff) | |
| parent | c3b2314a58e8d6f90766db2ef82303bafcefb766 (diff) | |
| download | build-bf4cdb49a3e56b37f8bd2eeeeeb4a72795dcd0a9.zip build-bf4cdb49a3e56b37f8bd2eeeeeb4a72795dcd0a9.tar.gz build-bf4cdb49a3e56b37f8bd2eeeeeb4a72795dcd0a9.tar.bz2 | |
am c3b2314a: am a37550ed: Merge "Use prebuilt flex."
* commit 'c3b2314a58e8d6f90766db2ef82303bafcefb766':
Use prebuilt flex.
Diffstat (limited to 'core/config.mk')
| -rw-r--r-- | core/config.mk | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/core/config.mk b/core/config.mk index c6e859d..abce2b0 100644 --- a/core/config.mk +++ b/core/config.mk @@ -351,7 +351,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 @@ -412,8 +412,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) |