openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

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

am: d148a93adc

Change-Id: Ia97ae88d072e1698bab9f7a15858f1a10bc015d6
This commit is contained in:
Tobias Thierer 2017-12-06 11:16:12 +00:00 committed by android-build-merger
parent 696e4eb092 d148a93adc
commit 864b81d466
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 :=