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

Commit a466a58b authored by Pete Gillin's avatar Pete Gillin Committed by Gerrit Code Review
Browse files

Merge "Remove support for EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9."

parents f6997372 6a88bd49

core/config.mk

+0 −10
Original line number Original line Diff line number Diff line
@@ -627,16 +627,6 @@ JETIFIER := prebuilts/sdk/tools/jetifier/jetifier-standalone/bin/jetifier-standa 




EXTRACT_KERNEL := build/make/tools/extract_kernel.py

EXTRACT_KERNEL := build/make/tools/extract_kernel.py





USE_OPENJDK9 := true



ifeq ($(EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9),)

TARGET_OPENJDK9 := true

else ifeq ($(EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9),true)

TARGET_OPENJDK9 := true

else ifeq ($(EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9),false)

TARGET_OPENJDK9 :=

endif



# Path to tools.jar

# Path to tools.jar

HOST_JDK_TOOLS_JAR := $(ANDROID_JAVA8_HOME)/lib/tools.jar

HOST_JDK_TOOLS_JAR := $(ANDROID_JAVA8_HOME)/lib/tools.jar

core/java.mk

+0 −2
Original line number Original line Diff line number Diff line
@@ -358,9 +358,7 @@ include $(BUILD_SYSTEM)/jacoco.mk 




# Temporarily enable --multi-dex until proguard supports v53 class files

# Temporarily enable --multi-dex until proguard supports v53 class files

# ( http://b/67673860 ) or we move away from proguard altogether.

# ( http://b/67673860 ) or we move away from proguard altogether.

ifdef TARGET_OPENJDK9

LOCAL_DX_FLAGS := $(filter-out --multi-dex,$(LOCAL_DX_FLAGS)) --multi-dex

LOCAL_DX_FLAGS := $(filter-out --multi-dex,$(LOCAL_DX_FLAGS)) --multi-dex

endif





full_classes_pre_proguard_jar := $(LOCAL_FULL_CLASSES_JACOCO_JAR)

full_classes_pre_proguard_jar := $(LOCAL_FULL_CLASSES_JACOCO_JAR)

core/java_common.mk

+1 −2
Original line number Original line Diff line number Diff line
@@ -33,8 +33,7 @@ ifeq (,$(LOCAL_JAVA_LANGUAGE_VERSION)) 
    # TODO(ccross): allow 1.9 for current and unbundled once we have SDK system modules

    # TODO(ccross): allow 1.9 for current and unbundled once we have SDK system modules

    LOCAL_JAVA_LANGUAGE_VERSION := 1.8

    LOCAL_JAVA_LANGUAGE_VERSION := 1.8

  else

  else

    # DEFAULT_JAVA_LANGUAGE_VERSION is 1.8, unless TARGET_OPENJDK9 in which case it is 1.9

    LOCAL_JAVA_LANGUAGE_VERSION := 1.9

    LOCAL_JAVA_LANGUAGE_VERSION := $(DEFAULT_JAVA_LANGUAGE_VERSION)

  endif

  endif

endif

endif

LOCAL_JAVACFLAGS += -source $(LOCAL_JAVA_LANGUAGE_VERSION) -target $(LOCAL_JAVA_LANGUAGE_VERSION)

LOCAL_JAVACFLAGS += -source $(LOCAL_JAVA_LANGUAGE_VERSION) -target $(LOCAL_JAVA_LANGUAGE_VERSION)