Merge "Build: Experimental option to default to -source 1.9 -target 1.9"

This commit is contained in:
Tobias Thierer 2017-07-27 10:40:43 +00:00 committed by Gerrit Code Review
commit 67352ffa1f

View file

@ -19,7 +19,11 @@ ifeq (,$(LOCAL_JAVA_LANGUAGE_VERSION))
ifneq (,$(filter $(LOCAL_SDK_VERSION), $(private_sdk_versions_without_any_java_18_support)))
LOCAL_JAVA_LANGUAGE_VERSION := 1.7
else
LOCAL_JAVA_LANGUAGE_VERSION := 1.8
ifneq ($(EXPERIMENTAL_USE_OPENJDK9),true)
LOCAL_JAVA_LANGUAGE_VERSION := 1.8
else
LOCAL_JAVA_LANGUAGE_VERSION := 1.9
endif
endif
endif
LOCAL_JAVACFLAGS += -source $(LOCAL_JAVA_LANGUAGE_VERSION) -target $(LOCAL_JAVA_LANGUAGE_VERSION)