Check LEGACY_USE_JAVA7 before using 1.8.

Fixes current bots not updated to Java8 yet.

Change-Id: I61f5a3f0de6ca0ee9eca64f0ee08454f93e59704
This commit is contained in:
Nicolas Geoffray 2016-02-29 12:07:00 +00:00
parent a9b464770b
commit 8d772e26b4
1 changed files with 5 additions and 1 deletions

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)