commit ef3cc713d4dc47a2d6a7539afdddab84a67a9ced
author Neil Fuller <nfuller@google.com> Tue Feb 23 11:31:25 2016 +0000
committer Neil Fuller <nfuller@google.com> Tue Feb 23 15:01:55 2016 +0000
tree 9e008d03463c2d1a57825fe19c03e46bd2cf0899
parent bf6bd40faa264ec2727a4b23e6e4b72815ec5518

Pin messaging to use Jack with 1.7 language

There is a bug in the current version of Jack
that causes problems when the default is changed to
1.8. Pinning to 1.7 appears to help.

Bug: 27305482
Bug: 26753820
(cherry picked from commit 445d7baabc65ffec355e47d0452bafa0f6804923)

Change-Id: I178ef57bc29cb49064db08d06d501d6aed09c26f

Android.mk

diff --git a/Android.mk b/Android.mk
index e2ed18b..64f1935 100644
--- a/Android.mk
+++ b/Android.mk
@@ -81,6 +81,9 @@
 
 LOCAL_SDK_VERSION := current
 
+# Workaround for http://b/27305482
+LOCAL_JAVA_LANGUAGE_VERSION := 1.7
+
 include $(BUILD_PACKAGE)
 
 include $(call all-makefiles-under, $(LOCAL_PATH))