Merge "Revert "Default to building with OpenJDK 9 -target 1.8."" am: 2ea4ed5911

am: a363f249e9

Change-Id: Iaa4ff98107045f5b3ffd19be8dcb61b168ebf7f1
This commit is contained in:
Tobias Thierer 2017-12-06 14:13:21 +00:00 committed by android-build-merger
commit e8ef654e04

View file

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