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

Commit 97ffb1ab authored by Neil Fuller's avatar Neil Fuller Committed by android-build-merger
Browse files

Merge "Revert "Revert "Make OpenJDK 8 the default""" 

am: 385ac867

* commit '385ac867':
  Revert "Revert "Make OpenJDK 8 the default""
parents d39a629d 385ac867

core/droiddoc.mk

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ $(full_target): $(full_src_files) $(full_java_lib_deps) 
                \@$(PRIVATE_SRC_LIST_FILE) \

                -J-Xmx1024m \

                -XDignore.symbol.file \

                $(if $(EXPERIMENTAL_USE_JAVA8),-Xdoclint:none) \

                $(if $(LEGACY_USE_JAVA7),,-Xdoclint:none) \

                $(PRIVATE_PROFILING_OPTIONS) \

                $(addprefix -classpath ,$(PRIVATE_CLASSPATH)) \

                $(addprefix -bootclasspath ,$(PRIVATE_BOOTCLASSPATH)) \

core/main.mk

+7 −7
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ include $(BUILD_SYSTEM)/cleanbuild.mk 
# Include the google-specific config

-include vendor/google/build/config.mk



VERSION_CHECK_SEQUENCE_NUMBER := 5

VERSION_CHECK_SEQUENCE_NUMBER := 6

-include $(OUT_DIR)/versions_checked.mk

ifneq ($(VERSION_CHECK_SEQUENCE_NUMBER),$(VERSIONS_CHECKED))
@@ -180,19 +180,19 @@ endif 
java_version_str := $(shell unset _JAVA_OPTIONS && java -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

# default, and 1.8 if EXPERIMENTAL_USE_JAVA8 is set

ifneq ($(EXPERIMENTAL_USE_JAVA8),)

# Check for the correct version of java, should be 1.8 by

# default and only 1.7 if LEGACY_USE_JAVA7 is set.

ifeq ($(LEGACY_USE_JAVA7),) # if LEGACY_USE_JAVA7 == ''

required_version := "1.8.x"

required_javac_version := "1.8"

java_version := $(shell echo '$(java_version_str)' | grep '[ "]1\.8[\. "$$]')

javac_version := $(shell echo '$(javac_version_str)' | grep '[ "]1\.8[\. "$$]')

else # default

else

required_version := "1.7.x"

required_javac_version := "1.7"

java_version := $(shell echo '$(java_version_str)' | grep '^java .*[ "]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)),)

$(info ************************************************************)
@@ -210,7 +210,7 @@ endif 


# 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

ifeq ($(BUILD_OS),linux)

requires_openjdk := true

envsetup.sh

+2 −1
Original line number Diff line number Diff line
@@ -1426,7 +1426,8 @@ function set_java_home() { 
    fi



    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

            Darwin)

                export JAVA_HOME=$(/usr/libexec/java_home -v 1.7)