Merge "Build with OpenJDK 9 -target 1.8 by default except for errorprone."
This commit is contained in:
commit
d4760b3eed
1 changed files with 4 additions and 0 deletions
|
@ -690,7 +690,11 @@ ANDROID_MANIFEST_MERGER := $(JAVA) -classpath prebuilts/devtools/tools/lib/manif
|
|||
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