p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am b34af41e: Merge "Fix java version detection when _JAVA_OPTIONS is set." 

* commit 'b34af41e578b1bbc02470d01593c45fe8b04588b':
  Fix java version detection when _JAVA_OPTIONS is set.
This commit is contained in:
Ying Wang 2014-04-01 00:11:00 +00:00 committed by Android Git Automerger
parent 2d0ecc1b00 b34af41e57
commit 4714d3d7a6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/main.mk
View File

@ -180,12 +180,12 @@ endif # if requires_openjdk
# EXPERIMENTAL_USE_JAVA7 is set, 1.6 otherwise. # EXPERIMENTAL_USE_JAVA7 is set, 1.6 otherwise.
ifneq ($(EXPERIMENTAL_USE_JAVA7),) ifneq ($(EXPERIMENTAL_USE_JAVA7),)
required_version := "1.7.x" required_version := "1.7.x"
java_version := $(shell java -version 2>&1 | head -n 1 | grep '^java .*[ "]1\.7[\. "$$]') java_version := $(shell java -version 2>&1 | grep '^java .*[ "]1\.7[\. "$$]' | head -n 1)
javac_version := $(shell javac -version 2>&1 | head -n 1 | grep '[ "]1\.7[\. "$$]') javac_version := $(shell javac -version 2>&1 | grep '[ "]1\.7[\. "$$]' | head -n 1 )
else # if EXPERIMENTAL_USE_JAVA7 else # if EXPERIMENTAL_USE_JAVA7
required_version := "1.6.x" required_version := "1.6.x"
java_version := $(shell java -version 2>&1 | head -n 1 | grep '^java .*[ "]1\.6[\. "$$]') java_version := $(shell java -version 2>&1 | grep '^java .*[ "]1\.6[\. "$$]' | head -n 1)
javac_version := $(shell javac -version 2>&1 | head -n 1 | grep '[ "]1\.6[\. "$$]') javac_version := $(shell javac -version 2>&1 | grep '[ "]1\.6[\. "$$]' | head -n 1)
endif # if EXPERIMENTAL_USE_JAVA7 endif # if EXPERIMENTAL_USE_JAVA7
ifeq ($(strip $(java_version)),) ifeq ($(strip $(java_version)),)
@ -193,7 +193,7 @@ $(info ************************************************************)
$(info You are attempting to build with the incorrect version) $(info You are attempting to build with the incorrect version)
$(info of java.) $(info of java.)
$(info $(space)) $(info $(space))
$(info Your version is: $(shell java -version 2>&1 | head -n 1).) $(info Your version is: $(shell java -version 2>&1 | grep '^java' | head -n 1).)
$(info The required version is: $(required_version)) $(info The required version is: $(required_version))
$(info $(space)) $(info $(space))
$(info Please follow the machine setup instructions at) $(info Please follow the machine setup instructions at)
@ -208,7 +208,7 @@ $(info ************************************************************)
$(info You are attempting to build with the incorrect version) $(info You are attempting to build with the incorrect version)
$(info of javac.) $(info of javac.)
$(info $(space)) $(info $(space))
$(info Your version is: $(shell javac -version 2>&1 | head -n 1).) $(info Your version is: $(shell javac -version 2>&1 | grep '^javac' | head -n 1).)
$(info The required version is: $(required_java_version)) $(info The required version is: $(required_java_version))
$(info $(space)) $(info $(space))
$(info Please follow the machine setup instructions at) $(info Please follow the machine setup instructions at)