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

Commit 4dfda1fa authored by Neil Fuller's avatar Neil Fuller Committed by Gerrit Code Review
Browse files

Merge "Remove Java 6 build support"

parents 660f3c9a 46e00ea4

core/combo/javac.mk

+0 −4
Original line number Diff line number Diff line
@@ -9,11 +9,7 @@ 
#   COMMON_JAVAC -- Java compiler command with common arguments

#



ifneq ($(LEGACY_USE_JAVA6),)

common_jdk_flags := -target 1.5 -Xmaxerrs 9999999

else

common_jdk_flags := -source 1.7 -target 1.7 -Xmaxerrs 9999999

endif



# Use the indexer wrapper to index the codebase instead of the javac compiler

ifeq ($(ALTERNATE_JAVAC),)

core/config.mk

+0 −10
Original line number Diff line number Diff line
@@ -418,17 +418,7 @@ else 
COLUMN:= column

endif



ifeq ($(HOST_OS),darwin)

ifeq ($(LEGACY_USE_JAVA6),)

HOST_JDK_TOOLS_JAR:= $(shell $(BUILD_SYSTEM)/find-jdk-tools-jar.sh)

else

# Deliberately set to blank for Java 6 installations on MacOS. These

# versions allegedly use a non-standard directory structure.

HOST_JDK_TOOLS_JAR :=

endif

else

HOST_JDK_TOOLS_JAR:= $(shell $(BUILD_SYSTEM)/find-jdk-tools-jar.sh)

endif



ifneq ($(HOST_JDK_TOOLS_JAR),)

ifeq ($(wildcard $(HOST_JDK_TOOLS_JAR)),)

core/main.mk

+1 −12
Original line number Diff line number Diff line
@@ -139,19 +139,11 @@ 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.6 if LEGACY_USE_JAVA6 is set.

ifeq ($(LEGACY_USE_JAVA6),)

# Check for the correct version of java.

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[\. "$$]')

else # if LEGACY_USE_JAVA6

required_version := "1.6.x"

required_javac_version := "1.6"

java_version := $(shell echo '$(java_version_str)' | grep '^java .*[ "]1\.6[\. "$$]')

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

endif # if LEGACY_USE_JAVA6



ifeq ($(strip $(java_version)),)

$(info ************************************************************)
@@ -170,13 +162,10 @@ endif 
# 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

ifeq ($(LEGACY_USE_JAVA6),)

ifeq ($(HOST_OS), linux)

requires_openjdk := true

endif

endif





# Check for the current jdk

envsetup.sh

+9 −20
Original line number Diff line number Diff line
@@ -1390,7 +1390,7 @@ function godir () { 
    \cd $T/$pathname

}



# Force JAVA_HOME to point to java 1.7 or java 1.6  if it isn't already set.

# Force JAVA_HOME to point to java 1.7 if it isn't already set.

#

# Note that the MacOS path for java 1.7 includes a minor revision number (sigh).

# For some reason, installing the JDK doesn't make it show up in the
@@ -1407,16 +1407,6 @@ function set_java_home() { 
    fi



    if [ ! "$JAVA_HOME" ]; then

      if [ -n "$LEGACY_USE_JAVA6" ]; then

        case `uname -s` in

            Darwin)

                export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home

                ;;

            *)

                export JAVA_HOME=/usr/lib/jvm/java-6-sun

                ;;

        esac

      else

      case `uname -s` in

          Darwin)

              export JAVA_HOME=$(/usr/libexec/java_home -v 1.7)
@@ -1425,7 +1415,6 @@ function set_java_home() { 
              export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64

              ;;

      esac

      fi



      # Keep track of the fact that we set JAVA_HOME ourselves, so that

      # we can change it on the next envsetup.sh, if required.