commit d2d6de39e231863b8d91a0025f45637aaf400e3e
author Neil Fuller <nfuller@google.com> Tue Feb 23 17:00:26 2016 +0000
committer Neil Fuller <nfuller@google.com> Tue Feb 23 17:00:26 2016 +0000
tree d5ab2902482894ffcd3ee39ba39698383dc4f693
parent 94005f898bae4ac00c9a0e8e93fa0d614b30f165

Pin libraries needed by vogar tool to java 1.7

vogar still uses javac/dx by default. dx does not
handle v52 class files. The default java version
is going to switch to 1.8. This change pins the
targets need by vogar to 1.7.

Bug: 26753820
Bug: 27310428
Change-Id: Ie06378b11acd2a96daf6ddd0f38ab2a90bcc9a88

Android.mk

diff --git a/Android.mk b/Android.mk
index 2e03c2b..7c6cfd9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -28,5 +28,6 @@
 LOCAL_SRC_FILES := $(call all-java-files-under, guava/src)
 LOCAL_MODULE := guavalib
 LOCAL_STATIC_JAVA_LIBRARIES := jsr305lib
+LOCAL_JAVA_LANGUAGE_VERSION := 1.7
 
 include $(BUILD_HOST_JAVA_LIBRARY)