Merge "Revert "Build with OpenJDK 9 -target 1.8 by default except for errorprone."" am: 909a2d96f2
am: fe1280f4e0
Change-Id: I457bc81cedf5d97148dd1abc2c0f8d2766be05c4
This commit is contained in:
commit
5d214a3844
1 changed files with 0 additions and 4 deletions
|
@ -699,11 +699,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 :=
|
||||
|
|
Loading…
Reference in a new issue