Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a37550ed authored by Ying Wang's avatar Ying Wang Committed by Gerrit Code Review
Browse files

Merge "Use prebuilt flex."

parents 889a93a4 fb1236a9
Loading
Loading
Loading
Loading
+1 −3
Original line number Diff line number Diff line
@@ -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
@@ -409,8 +409,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)