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: 3342e45722 

am: 1c64b02a4d

Change-Id: Ieef89169d6eb521823643f8bffb2815b6d0a35a2
This commit is contained in:
Tobias Thierer 2017-12-11 19:23:49 +00:00 committed by android-build-merger
parent a7632a0e98 1c64b02a4d
commit 6bfcac877e
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

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