p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Build with OpenJDK 9 -target 1.8 by default except for errorprone." 

am: d4760b3eed

Change-Id: I051acf7e54d1fcbaf18943b11436d8566a2568a7
This commit is contained in:
Tobias Thierer 2017-12-06 11:09:39 +00:00 committed by android-build-merger
parent 24ed707951 d4760b3eed
commit d148a93adc
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/config.mk
View File

@ -697,7 +697,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 :=