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

Remove support for EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9.

Browse Source 
Prior to this change, setting that to "false" turned the default Java
language level back to 8. This change removes that option.

Also remove the unused make variable USE_OPENJDK9.

Bug: 115604102
Test: m java droid docs tests cts
Change-Id: I040cf83a2457227ffbcd1c62649e33b98c0c66f7
This commit is contained in:
Pete Gillin
2019-10-17 16:21:58 +01:00
parent 8567331a4f
commit 6a88bd49bc
3 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java.mk
View File

@@ -358,9 +358,7 @@ include $(BUILD_SYSTEM)/jacoco.mk
# Temporarily enable --multi-dex until proguard supports v53 class files
# ( http://b/67673860 ) or we move away from proguard altogether.
ifdef TARGET_OPENJDK9
LOCAL_DX_FLAGS := $(filter-out --multi-dex,$(LOCAL_DX_FLAGS)) --multi-dex
endif
full_classes_pre_proguard_jar := $(LOCAL_FULL_CLASSES_JACOCO_JAR)