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

Merge "Cap LOCAL_JAVA_LANGUAGE_VERSION <= 1.8 for API versions <= 26."

Browse source 
am: c6465f5d17

Change-Id: I52fec751f0dcd729f1903c4e70a6bbef8873488b
This commit is contained in:
Tobias Thierer 2017-10-06 19:58:34 +00:00 committed by android-build-merger
commit 719728f67d
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/java_common.mk
View file

@ -22,7 +22,12 @@ ifeq (,$(LOCAL_JAVA_LANGUAGE_VERSION))
ifneq ($(EXPERIMENTAL_USE_OPENJDK9),true)
LOCAL_JAVA_LANGUAGE_VERSION := 1.8
else
LOCAL_JAVA_LANGUAGE_VERSION := 1.9
private_sdk_versions_without_any_java_19_support := 24 25 26
ifneq (,$(filter $(LOCAL_SDK_VERSION), $(private_sdk_versions_without_any_java_19_support)))
LOCAL_JAVA_LANGUAGE_VERSION := 1.8
else
LOCAL_JAVA_LANGUAGE_VERSION := 1.9
endif
endif
endif
endif