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 (attempt 4)." 

am: 1644e2f1b7

Change-Id: Iafd0db73afc0d6ce831eb97f1bafbc1cd04fb8f4
This commit is contained in:
Tobias Thierer 2018-01-04 11:24:54 +00:00 committed by android-build-merger
parent c9f5afb07e 1644e2f1b7
commit a902b41648
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

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