Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d148a93a authored Dec 06, 2017 by Tobias Thierer Committed by android-build-merger Dec 06, 2017

Merge "Build with OpenJDK 9 -target 1.8 by default except for errorprone."

am: d4760b3e

Change-Id: I051acf7e54d1fcbaf18943b11436d8566a2568a7

core/config.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -697,7 +697,11 @@ 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 :=