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 (attempt 4)." am: 1644e2f1b7 

am: a902b41648

Change-Id: I5f6e9fdde1d6d2d5f042d3301910cb5e0ddfe180
This commit is contained in:
Tobias Thierer 2018-01-04 11:28:56 +00:00 committed by android-build-merger
parent 08cf35feb9 a902b41648
commit d7b2ec09d9
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 :=