Merge "Rename EXPERIMENTAL_USE_OPENJDK9 to EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9."

am: aa448d138b

Change-Id: I12ef0a12aea45a9782105ff3324d8f9c773a1817
This commit is contained in:
Pete Gillin
2019-05-10 05:16:20 -07:00
committed by android-build-merger

View File

@@ -624,11 +624,9 @@ EXTRACT_KERNEL := build/make/tools/extract_kernel.py
USE_OPENJDK9 := true
ifeq ($(EXPERIMENTAL_USE_OPENJDK9),)
ifeq ($(EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9),)
TARGET_OPENJDK9 :=
else ifeq ($(EXPERIMENTAL_USE_OPENJDK9),1.8)
TARGET_OPENJDK9 :=
else ifeq ($(EXPERIMENTAL_USE_OPENJDK9),true)
else ifeq ($(EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9),true)
TARGET_OPENJDK9 := true
endif