StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 3342e45722

Change-Id: Iedf41adf5cf04614a1bcb27eea5e2e3cb61c96b9
This commit is contained in:
Tobias Thierer
2017-12-11 19:17:41 +00:00
committed by android-build-merger
parent 9a6273a947 3342e45722
commit 1c64b02a4d
1 changed files with 4 additions and 0 deletions
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 COLUMN:= column
ifeq ($(EXPERIMENTAL_USE_OPENJDK9),) ifeq ($(EXPERIMENTAL_USE_OPENJDK9),)
ifeq ($(RUN_ERROR_PRONE),true)
USE_OPENJDK9 := USE_OPENJDK9 :=
else
USE_OPENJDK9 := true
endif
TARGET_OPENJDK9 := TARGET_OPENJDK9 :=
else ifeq ($(EXPERIMENTAL_USE_OPENJDK9),false) else ifeq ($(EXPERIMENTAL_USE_OPENJDK9),false)
USE_OPENJDK9 := USE_OPENJDK9 :=