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 needed by vogar to 1.7.
Bug: 26753820
Bug: 27310428
Change-Id: I5825db13bdb2d3d71e0f4f3c309baa26bb456966
diff --git a/Android.mk b/Android.mk
index ee45b62..cb402a8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -46,6 +46,7 @@
PROCESSOR_CLASSES := $(DAGGER2_PROCESSOR_CLASSES)
include external/dagger2/java_annotation_processors.mk
+LOCAL_JAVA_LANGUAGE_VERSION := 1.7
include $(BUILD_HOST_JAVA_LIBRARY)
# Remember the location of the generated files, this is needed for when
@@ -68,6 +69,7 @@
caliper/src/main/java/com/google/caliper/All.java \
caliper/src/main/java/com/google/caliper/Benchmark.java
+LOCAL_JAVA_LANGUAGE_VERSION := 1.7
include $(BUILD_JAVA_LIBRARY)
# build caliper tests
@@ -96,6 +98,7 @@
PROCESSOR_CLASSES := $(DAGGER2_PROCESSOR_CLASSES)
include external/dagger2/java_annotation_processors.mk
+LOCAL_JAVA_LANGUAGE_VERSION := 1.7
include $(BUILD_HOST_JAVA_LIBRARY)
# build caliper examples
@@ -114,6 +117,7 @@
junit \
mockito-host
+LOCAL_JAVA_LANGUAGE_VERSION := 1.7
include $(BUILD_HOST_JAVA_LIBRARY)
# Build host dependencies.