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

Merge "A few more Java7 related clean ups."

This commit is contained in:
Narayan Kamath 2013-12-06 17:10:52 +00:00 committed by Gerrit Code Review
parent 18ee9e5e7d e2d27887be
commit fe57f66507
2 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/combo/javac.mk
View File

@ -8,10 +8,10 @@
# COMMON_JAVAC -- Java compiler command with common arguments
#
ifeq ($(EXPERIMENTAL_USE_JAVA7_OPENJDK),)
ifeq ($(EXPERIMENTAL_USE_JAVA7),)
common_flags := -target 1.5 -Xmaxerrs 9999999
else
common_flags := -Xmaxerrs 9999999
common_flags := -source 1.7 -target 1.7 -Xmaxerrs 9999999
endif

42
core/main.mk
View File

@ -138,18 +138,30 @@ $(warning ************************************************************)
$(error Directory names containing spaces not supported)
endif
# Check for the current jdk
ifneq ($(EXPERIMENTAL_USE_JAVA7_OPENJDK),)
# The user asked for java7 openjdk, so check that the host
# java version is really openjdk
# Check for the current JDK.
#
# For Java 1.7, we require OpenJDK on linux and Oracle JDK on Mac OS.
# For Java 1.6, we require Oracle for all host OSes.
requires_openjdk := false
ifneq ($(EXPERIMENTAL_USE_JAVA7),)
ifeq ($(HOST_OS), linux)
requires_openjdk := true
endif
endif
ifeq ($(requires_openjdk), true)
ifeq ($(shell java -version 2>&1 | grep -i openjdk),)
$(info ************************************************************)
$(info You asked for an OpenJDK 7 build but your version is)
$(info You are attempting to build with an unsupported JDK.)
$(info $(space))
$(info This build requires OpenJDK, but you are using:
$(info $(shell java -version 2>&1 | head -n 2).)
$(info Please follow the machine setup instructions at)
$(info $(space)$(space)$(space)$(space)https://source.android.com/source/download.html)
$(info ************************************************************)
$(error stop)
endif # java version is not OpenJdk
else # if EXPERIMENTAL_USE_JAVA7_OPENJDK
else # if requires_openjdk
ifneq ($(shell java -version 2>&1 | grep -i openjdk),)
$(info ************************************************************)
$(info You are attempting to build with an unsupported JDK.)
@ -160,21 +172,19 @@ $(info $(space)$(space)$(space)$(space)https://source.android.com/source/downloa
$(info ************************************************************)
$(error stop)
endif # java version is not Sun Oracle JDK
endif # if EXPERIMENTAL_USE_JAVA7_OPENJDK
endif # if requires_openjdk
# Check for the correct version of java, should be 1.7 if
# EXPERIMENTAL_USE_JAVA7_OPENJDK is set, 1.6 otherwise.
ifneq ($(EXPERIMENTAL_USE_JAVA7_OPENJDK),)
required_version := "OpenJDK 1.7"
required_javac_version := "1.7"
# EXPERIMENTAL_USE_JAVA7 is set, 1.6 otherwise.
ifneq ($(EXPERIMENTAL_USE_JAVA7),)
required_version := "1.7.x"
java_version := $(shell java -version 2>&1 | head -n 1 | grep '^java .*[ "]1\.7[\. "$$]')
javac_version := $(shell javac -version 2>&1 | head -n 1 | grep '[ "]1\.7[\. "$$]')
else # if EXPERIMENTAL_USE_JAVA7_OPENJDK
required_version := "JavaSE 1.6"
required_javac_version := "1.6"
else # if EXPERIMENTAL_USE_JAVA7
required_version := "1.6.x"
java_version := $(shell java -version 2>&1 | head -n 1 | grep '^java .*[ "]1\.6[\. "$$]')
javac_version := $(shell javac -version 2>&1 | head -n 1 | grep '[ "]1\.6[\. "$$]')
endif # if EXPERIMENTAL_USE_JAVA7_OPENJDK
endif # if EXPERIMENTAL_USE_JAVA7
ifeq ($(strip $(java_version)),)
$(info ************************************************************)
@ -197,7 +207,7 @@ $(info You are attempting to build with the incorrect version)
$(info of javac.)
$(info $(space))
$(info Your version is: $(shell javac -version 2>&1 | head -n 1).)
$(info The required version is: $(required_javac_version))
$(info The required version is: $(required_java_version))
$(info $(space))
$(info Please follow the machine setup instructions at)
$(info $(space)$(space)$(space)$(space)https://source.android.com/source/download.html)