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

Commit 4eb66a31 authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am bf145f88: am bf4cdb49: am c3b2314a: am a37550ed: Merge "Use prebuilt flex." 

* commit 'bf145f88':
  Use prebuilt flex.
parents 83cc0273 bf145f88

core/config.mk

+1 −3
Original line number Diff line number Diff line
@@ -350,7 +350,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
@@ -415,8 +415,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)