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

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

Browse Source
This commit is contained in:
Tobias Thierer
2017-10-06 19:42:57 +00:00
committed by Gerrit Code Review
parent dd68a6cb74 745c6a55d3
commit c6465f5d17
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java_common.mk
View File

@@ -21,10 +21,15 @@ ifeq (,$(LOCAL_JAVA_LANGUAGE_VERSION))
else
ifneq ($(EXPERIMENTAL_USE_OPENJDK9),true)
LOCAL_JAVA_LANGUAGE_VERSION := 1.8
else
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
LOCAL_JAVACFLAGS += -source $(LOCAL_JAVA_LANGUAGE_VERSION) -target $(LOCAL_JAVA_LANGUAGE_VERSION)