From 07bcdbf2e0a9ce721565b536de34ec11aaf614e7 Mon Sep 17 00:00:00 2001
From: Neil Fuller <nfuller@google.com>
Date: Tue, 23 Feb 2016 16:59:20 +0000
Subject: 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: I0f18bc98d3500828a09dbe5a4766940ee993b9fe
---
 Android.mk | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'Android.mk')

diff --git a/Android.mk b/Android.mk
index cc57c5fc8..21fa4c1dd 100644
--- a/Android.mk
+++ b/Android.mk
@@ -28,6 +28,7 @@ LOCAL_JAVA_LIBRARIES := \
   dagger2-inject-host \
   guavalib
 
+LOCAL_JAVA_LANGUAGE_VERSION := 1.7
 include $(BUILD_HOST_JAVA_LIBRARY)
 
 # build dagger2 producers host jar
@@ -45,6 +46,7 @@ LOCAL_JAVA_LIBRARIES := \
   dagger2-inject-host \
   guavalib
 
+LOCAL_JAVA_LANGUAGE_VERSION := 1.7
 include $(BUILD_HOST_JAVA_LIBRARY)
 
 # build dagger2 compiler host jar
@@ -90,6 +92,7 @@ PROCESSOR_CLASSES := \
 
 include $(LOCAL_PATH)/java_annotation_processors.mk
 
+LOCAL_JAVA_LANGUAGE_VERSION := 1.7
 include $(BUILD_HOST_JAVA_LIBRARY)
 
 # Build host dependencies.
-- 
cgit v1.2.3