Merge "Revert "Build with OpenJDK 9 -target 1.8 by default except for errorprone."" (909a2d96) · Commits · e / os / android_build

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