Merge "Enable Java language level 9 by default." am: 3e25573c13

am: 77a7d014b2

Change-Id: I7b9d57a367b23d9b5b63340d28d5fb7d02551c37
This commit is contained in:
Pete Gillin
2019-10-17 04:12:12 -07:00
committed by android-build-merger

View File

@@ -630,9 +630,11 @@ EXTRACT_KERNEL := build/make/tools/extract_kernel.py
USE_OPENJDK9 := true
ifeq ($(EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9),)
TARGET_OPENJDK9 :=
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