commit 8d772e26b48d112ec6dd2e265b3c60fc97b8bd88
author Nicolas Geoffray <ngeoffray@google.com> Mon Feb 29 12:07:00 2016 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Mon Feb 29 12:08:42 2016 +0000
tree 70400d0a9ac1262f45a30fdd1d55e1b079c7948a
parent a9b464770bf2a2a2cff279eb6042477786798d24

Check LEGACY_USE_JAVA7 before using 1.8.

Fixes current bots not updated to Java8 yet.

Change-Id: I61f5a3f0de6ca0ee9eca64f0ee08454f93e59704

core/java_common.mk

diff --git a/core/java_common.mk b/core/java_common.mk
index 1b9a861..d9ce9df 100644
--- a/core/java_common.mk
+++ b/core/java_common.mk
@@ -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)