From bfa043039d4b671f5c333222ae85da6f0c808cee Mon Sep 17 00:00:00 2001
From: Tobias Thierer <tobiast@google.com>
Date: Fri, 8 Dec 2017 20:27:48 +0000
Subject: [PATCH] Revert "Build with OpenJDK 9 -target 1.8 by default except
 for errorprone."

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

Bug: 69449021
Test: Treehugger

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

diff --git a/core/config.mk b/core/config.mk
index a6e0c2ce0..d7e6f1e5a 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -699,11 +699,7 @@ ANDROID_MANIFEST_MERGER := $(JAVA) \
 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 :=