Merge "Build with OpenJDK 9 -target 1.8 by default except for errorprone." am: d4760b3eed
am: d148a93adc
am: 864b81d466
Change-Id: I282dc8d54ff080c4bb54bae9a595424d45f7df24
This commit is contained in:
commit
3d4065026a
1 changed files with 4 additions and 0 deletions
|
@ -698,7 +698,11 @@ 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