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:
@@ -700,11 +700,7 @@ ANDROID_MANIFEST_MERGER := $(JAVA) \
|
|||||||
COLUMN:= column
|
COLUMN:= column
|
||||||
|
|
||||||
ifeq ($(EXPERIMENTAL_USE_OPENJDK9),)
|
ifeq ($(EXPERIMENTAL_USE_OPENJDK9),)
|
||||||
ifeq ($(RUN_ERROR_PRONE),true)
|
|
||||||
USE_OPENJDK9 :=
|
USE_OPENJDK9 :=
|
||||||
else
|
|
||||||
USE_OPENJDK9 := true
|
|
||||||
endif
|
|
||||||
TARGET_OPENJDK9 :=
|
TARGET_OPENJDK9 :=
|
||||||
else ifeq ($(EXPERIMENTAL_USE_OPENJDK9),false)
|
else ifeq ($(EXPERIMENTAL_USE_OPENJDK9),false)
|
||||||
USE_OPENJDK9 :=
|
USE_OPENJDK9 :=
|
||||||
|
Reference in New Issue
Block a user