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

Revert "Revert "Make OpenJDK 8 the default"" 

Reapply the switch to JDK 8 on aosp/master.

This reverts commit 85bddfdedf.

Change-Id: If2e8733ba78b007d37914c0512cd6be1bd4c1e69
This commit is contained in:
Neil Fuller 2016-01-25 17:12:41 +00:00
parent 85bddfdedf
commit 1f495b865e
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/droiddoc.mk
View File

@ -209,7 +209,7 @@ $(full_target): $(full_src_files) $(full_java_lib_deps)
\@$(PRIVATE_SRC_LIST_FILE) \ \@$(PRIVATE_SRC_LIST_FILE) \
-J-Xmx1024m \ -J-Xmx1024m \
-XDignore.symbol.file \ -XDignore.symbol.file \
$(if $(EXPERIMENTAL_USE_JAVA8),-Xdoclint:none) \ $(if $(LEGACY_USE_JAVA7),,-Xdoclint:none) \
$(PRIVATE_PROFILING_OPTIONS) \ $(PRIVATE_PROFILING_OPTIONS) \
$(addprefix -classpath ,$(PRIVATE_CLASSPATH)) \ $(addprefix -classpath ,$(PRIVATE_CLASSPATH)) \
$(addprefix -bootclasspath ,$(PRIVATE_BOOTCLASSPATH)) \ $(addprefix -bootclasspath ,$(PRIVATE_BOOTCLASSPATH)) \

14
core/main.mk
View File

@ -144,7 +144,7 @@ include $(BUILD_SYSTEM)/cleanbuild.mk
# Include the google-specific config # Include the google-specific config
-include vendor/google/build/config.mk -include vendor/google/build/config.mk
VERSION_CHECK_SEQUENCE_NUMBER := 5 VERSION_CHECK_SEQUENCE_NUMBER := 6
-include $(OUT_DIR)/versions_checked.mk -include $(OUT_DIR)/versions_checked.mk
ifneq ($(VERSION_CHECK_SEQUENCE_NUMBER),$(VERSIONS_CHECKED)) ifneq ($(VERSION_CHECK_SEQUENCE_NUMBER),$(VERSIONS_CHECKED))
@ -180,19 +180,19 @@ endif
java_version_str := $(shell unset _JAVA_OPTIONS && java -version 2>&1) java_version_str := $(shell unset _JAVA_OPTIONS && java -version 2>&1)
javac_version_str := $(shell unset _JAVA_OPTIONS && javac -version 2>&1) javac_version_str := $(shell unset _JAVA_OPTIONS && javac -version 2>&1)
# Check for the correct version of java, should be 1.7 by # Check for the correct version of java, should be 1.8 by
# default, and 1.8 if EXPERIMENTAL_USE_JAVA8 is set # default and only 1.7 if LEGACY_USE_JAVA7 is set.
ifneq ($(EXPERIMENTAL_USE_JAVA8),) ifeq ($(LEGACY_USE_JAVA7),) # if LEGACY_USE_JAVA7 == ''
required_version := "1.8.x" required_version := "1.8.x"
required_javac_version := "1.8" required_javac_version := "1.8"
java_version := $(shell echo '$(java_version_str)' | grep '[ "]1\.8[\. "$$]') java_version := $(shell echo '$(java_version_str)' | grep '[ "]1\.8[\. "$$]')
javac_version := $(shell echo '$(javac_version_str)' | grep '[ "]1\.8[\. "$$]') javac_version := $(shell echo '$(javac_version_str)' | grep '[ "]1\.8[\. "$$]')
else # default else
required_version := "1.7.x" required_version := "1.7.x"
required_javac_version := "1.7" required_javac_version := "1.7"
java_version := $(shell echo '$(java_version_str)' | grep '^java .*[ "]1\.7[\. "$$]') java_version := $(shell echo '$(java_version_str)' | grep '^java .*[ "]1\.7[\. "$$]')
javac_version := $(shell echo '$(javac_version_str)' | grep '[ "]1\.7[\. "$$]') javac_version := $(shell echo '$(javac_version_str)' | grep '[ "]1\.7[\. "$$]')
endif # if EXPERIMENTAL_USE_JAVA8 endif # if LEGACY_USE_JAVA7 == ''
ifeq ($(strip $(java_version)),) ifeq ($(strip $(java_version)),)
$(info ************************************************************) $(info ************************************************************)
@ -210,7 +210,7 @@ endif
# Check for the current JDK. # Check for the current JDK.
# #
# For Java 1.7, we require OpenJDK on linux and Oracle JDK on Mac OS. # For Java 1.7/1.8, we require OpenJDK on linux and Oracle JDK on Mac OS.
requires_openjdk := false requires_openjdk := false
ifeq ($(BUILD_OS),linux) ifeq ($(BUILD_OS),linux)
requires_openjdk := true requires_openjdk := true

3
envsetup.sh
View File

@ -1426,7 +1426,8 @@ function set_java_home() {
fi fi
if [ ! "$JAVA_HOME" ]; then if [ ! "$JAVA_HOME" ]; then
if [ ! "$EXPERIMENTAL_USE_JAVA8" ]; then if [ -n "$LEGACY_USE_JAVA7" ]; then
echo Warning: Support for JDK 7 will be dropped. Switch to JDK 8.
case `uname -s` in case `uname -s` in
Darwin) Darwin)
export JAVA_HOME=$(/usr/libexec/java_home -v 1.7) export JAVA_HOME=$(/usr/libexec/java_home -v 1.7)