Merge "Revert "Build with OpenJDK 9 -target 1.8 by default except for errorprone."" am: 909a2d96f2 am: fe1280f4e0

am: 5d214a3844

Change-Id: I08099b9355ceeec2e66bb6d5bfdd3f2198b20aa5
This commit is contained in:
Tobias Thierer 2017-12-11 23:17:57 +00:00 committed by android-build-merger
commit e8c8b574b2

View file

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