Commit bfa04303 authored Dec 08, 2017 by Tobias Thierer

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

parent ab1e54d5

core/config.mk

+0 −4

Original line number	Diff line number	Diff line
		@@ -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 :=