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: 3342e45722 am: 1c64b02a4d 

am: 6bfcac877e

Change-Id: Ida8e40a9a0bf922891d404cdc5e2a92ed3d981e5
This commit is contained in:
Tobias Thierer 2017-12-11 19:29:25 +00:00 committed by android-build-merger
parent 463c9e7bc6 6bfcac877e
commit 6de04b723d
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

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