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
This commit is contained in:
Tobias Thierer 2017-12-08 20:27:48 +00:00
parent ab1e54d5f1
commit bfa043039d
1 changed files with 0 additions and 4 deletions

View File

@ -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 :=