From a4fc423ebf4e5753ff8a30f676ae4e09fa4b70df Mon Sep 17 00:00:00 2001
From: Tobias Thierer <tobiast@google.com>
Date: Tue, 5 Dec 2017 01:48:33 +0000
Subject: [PATCH] Revert "Default to building with OpenJDK 9 -target 1.8."

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,
https://r.android.com/#/q/topic:bug_69449021

Bug: 69449021
Test: Treehugger

This reverts commit 3337fbfa6114379f13a35ad3d6bf9cb5a5b8689b

Change-Id: Ibc050ad9a87dceb336e7cd961015e70a639e43db
---
 core/config.mk | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/core/config.mk b/core/config.mk
index d4dae70f7..5fd299335 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -690,11 +690,7 @@ ANDROID_MANIFEST_MERGER := $(JAVA) -classpath prebuilts/devtools/tools/lib/manif
 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 :=