Merge "Check LEGACY_USE_JAVA7 before using 1.8."

This commit is contained in:
Nicolas Geoffray
2016-02-29 12:27:58 +00:00
committed by Gerrit Code Review

View File

@@ -4,7 +4,11 @@
## Java version
###########################################################
ifeq (,$(LOCAL_JAVA_LANGUAGE_VERSION))
LOCAL_JAVA_LANGUAGE_VERSION := 1.8
ifeq (,$(LEGACY_USE_JAVA7))
LOCAL_JAVA_LANGUAGE_VERSION := 1.8
else
LOCAL_JAVA_LANGUAGE_VERSION := 1.7
endif
endif
LOCAL_JAVACFLAGS += -source $(LOCAL_JAVA_LANGUAGE_VERSION) -target $(LOCAL_JAVA_LANGUAGE_VERSION)