commit b8eab12e50241f1725812595f355d5cf8fa104ed
author Pete Gillin <peteg@google.com> Thu Oct 03 12:28:32 2019 +0100
committer Tobias Thierer <tobiast@google.com> Thu Oct 03 12:16:57 2019 +0000
tree ddad6520459eb35906632958afba8ff1a6a95c3c
parent 848e642096889da02789d81ccfcb454e7c5d8649

Revert "Enable Java language level 9 by default."

This reverts commit 848e642096889da02789d81ccfcb454e7c5d8649.

Test: make
Bug: 115604102
Change-Id: I3ce588e89b9c25255d338f3004d1d9876799eb6e

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 84ea03f..d120d61 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -630,11 +630,9 @@
 USE_OPENJDK9 := true
 
 ifeq ($(EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9),)
-TARGET_OPENJDK9 := true
+TARGET_OPENJDK9 :=
 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