Merge "Revert "Default to building with OpenJDK 9 -target 1.8.""

am: 2ea4ed5911

Change-Id: I0fd225966b98a212b8c9712a4942cfe3e8bd9dc2
This commit is contained in:
Tobias Thierer 2017-12-06 14:09:31 +00:00 committed by android-build-merger
commit a363f249e9
1 changed files with 0 additions and 4 deletions

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 :=