Merge "Enable Java language level 9 by default."

am: 3e25573c13

Change-Id: I6190f392ef5664fd738221b18b367d2255fb4737
This commit is contained in:
Pete Gillin 2019-10-17 04:05:13 -07:00 committed by android-build-merger
commit 77a7d014b2

View file

@ -630,9 +630,11 @@ EXTRACT_KERNEL := build/make/tools/extract_kernel.py
USE_OPENJDK9 := true USE_OPENJDK9 := true
ifeq ($(EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9),) ifeq ($(EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9),)
TARGET_OPENJDK9 := TARGET_OPENJDK9 := true
else ifeq ($(EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9),true) else ifeq ($(EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9),true)
TARGET_OPENJDK9 := true TARGET_OPENJDK9 := true
else ifeq ($(EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9),false)
TARGET_OPENJDK9 :=
endif endif
# Path to tools.jar # Path to tools.jar