Merge "Revert "Default to building with OpenJDK 9 -target 1.8.""
am: 2ea4ed5911
Change-Id: I0fd225966b98a212b8c9712a4942cfe3e8bd9dc2
This commit is contained in:
commit
a363f249e9
|
@ -697,11 +697,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 :=
|
||||||
|
|
Loading…
Reference in New Issue