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

core/config.mk

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -690,7 +690,11 @@ ANDROID_MANIFEST_MERGER := $(JAVA) -classpath prebuilts/devtools/tools/lib/manif
	COLUMN:= column		COLUMN:= column

	ifeq ($(EXPERIMENTAL_USE_OPENJDK9),)		ifeq ($(EXPERIMENTAL_USE_OPENJDK9),)
			ifeq ($(RUN_ERROR_PRONE),true)
	USE_OPENJDK9 :=		USE_OPENJDK9 :=
			else
			USE_OPENJDK9 := true
			endif
	TARGET_OPENJDK9 :=		TARGET_OPENJDK9 :=
	else ifeq ($(EXPERIMENTAL_USE_OPENJDK9),false)		else ifeq ($(EXPERIMENTAL_USE_OPENJDK9),false)
	USE_OPENJDK9 :=		USE_OPENJDK9 :=