Merge "Build with OpenJDK 9 -target 1.8 by default (attempt 4)."

This commit is contained in:
Tobias Thierer 2018-01-04 11:18:11 +00:00 committed by Gerrit Code Review
commit 1644e2f1b7

View file

@ -705,7 +705,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 :=