Revert "Build with OpenJDK 9 -target 1.8 by default (attempt 3)."
After this revert CL topic, the default toolchain for Android
goes back to being OpenJDK 8.
This revert is being prepared ahead of time in case of
any problems with original change topic.
Bug: 69449021
Test: Treehugger
Change-Id: Ifcefbc1e1357dbe255686e2aeb7a71112d799219
diff --git a/core/config.mk b/core/config.mk
index 7f588f4..eda9b05 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -701,11 +701,7 @@
COLUMN:= column
ifeq ($(EXPERIMENTAL_USE_OPENJDK9),)
-ifeq ($(RUN_ERROR_PRONE),true)
USE_OPENJDK9 :=
-else
-USE_OPENJDK9 := true
-endif
TARGET_OPENJDK9 :=
else ifeq ($(EXPERIMENTAL_USE_OPENJDK9),false)
USE_OPENJDK9 :=