tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Build with OpenJDK 9 -target 1.8 by default except for errorprone." am: d4760b3eed am: d148a93adc

Browse source 
am: 864b81d466

Change-Id: I282dc8d54ff080c4bb54bae9a595424d45f7df24
This commit is contained in:
Tobias Thierer 2017-12-06 11:22:27 +00:00 committed by android-build-merger
commit 3d4065026a
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

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