From 7c05949407f12416caaddd44c8971846a468d97d Mon Sep 17 00:00:00 2001
From: Tobias Thierer <tobiast@google.com>
Date: Tue, 5 Dec 2017 02:10:34 +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 0ae8b548af38c8b8fccea7cdef11d54740d3bb6a.

Change-Id: Ief7646a94f1a264085cd299b4327d244b78a1537
---
 android/config.go  |  7 ++-----
 ui/build/config.go | 11 +----------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/android/config.go b/android/config.go
index f806b4987..0eebb5fbd 100644
--- a/android/config.go
+++ b/android/config.go
@@ -295,10 +295,7 @@ func NewConfig(srcDir, buildDir string) (Config, error) {
 func (c *config) fromEnv() error {
 	switch c.Getenv("EXPERIMENTAL_USE_OPENJDK9") {
 	case "":
-		if c.Getenv("RUN_ERROR_PRONE") != "true" {
-			// Use OpenJDK9, but target 1.8
-			c.useOpenJDK9 = true
-		}
+		// Use OpenJDK8
 	case "false":
 		// Use OpenJDK8
 	case "1.8":
@@ -309,7 +306,7 @@ func (c *config) fromEnv() error {
 		c.useOpenJDK9 = true
 		c.targetOpenJDK9 = true
 	default:
-		return fmt.Errorf(`Invalid value for EXPERIMENTAL_USE_OPENJDK9, should be "", "false", "1.8", or "true"`)
+		return fmt.Errorf(`Invalid value for EXPERIMENTAL_USE_OPENJDK9, should be "", "1.8", or "true"`)
 	}
 
 	return nil
diff --git a/ui/build/config.go b/ui/build/config.go
index b608d3868..df97d803d 100644
--- a/ui/build/config.go
+++ b/ui/build/config.go
@@ -150,16 +150,7 @@ func NewConfig(ctx Context, args ...string) Config {
 		if override, ok := ret.environ.Get("OVERRIDE_ANDROID_JAVA_HOME"); ok {
 			return override
 		}
-		v, ok := ret.environ.Get("EXPERIMENTAL_USE_OPENJDK9")
-		if !ok {
-			v2, ok2 := ret.environ.Get("RUN_ERROR_PRONE")
-			if ok2 && (v2 == "true") {
-				v = "false"
-			} else {
-				v = "1.8"
-			}
-		}
-		if v != "false" {
+		if v, ok := ret.environ.Get("EXPERIMENTAL_USE_OPENJDK9"); ok && v != "" && v != "false" {
 			return filepath.Join("prebuilts/jdk/jdk9", ret.HostPrebuiltTag())
 		}
 		return filepath.Join("prebuilts/jdk/jdk8", ret.HostPrebuiltTag())