commit aa448d138ba92790f8283fda9e525bb736b38916
author Pete Gillin <peteg@google.com> Fri May 10 11:50:08 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 10 11:50:08 2019 +0000
tree df75986a32de2e6003354810f813ff43e308e8f5
parent 62ae23267f1d54641d4322884f3c975ae3d3cb3e
parent 273b25f9fd71d24fd8ad1380c54802475a76a74c

Merge "Rename EXPERIMENTAL_USE_OPENJDK9 to EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9."

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 1db37ef..2baadce 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -624,11 +624,9 @@
 
 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