aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland Levillain <rpl@google.com>2019-11-05 05:11:06 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-11-05 05:11:06 -0800
commit79aeeeecac52a9b676b5a270128d9f24a1e7eafc (patch)
tree48a5abb1ee34825eb8f9b72e12d566db58f1dc2e
parentabdd61c2186efa8110ab659458adb77a4c26c134 (diff)
parent4c06c6e260788797ab1d9a2e21917e8f70eba4c3 (diff)
downloadvogar-79aeeeecac52a9b676b5a270128d9f24a1e7eafc.tar.gz
Merge "No longer pin the Java version used to build Vogar to 1.7."
am: 4c06c6e260 Change-Id: Ibfa22ab8ec8f824419fd2834b373caa9ed1676a1
-rw-r--r--Android.mk3
1 files changed, 0 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index 8505d51..9fffc8a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -40,7 +40,6 @@ LOCAL_ADDITIONAL_DEPENDENCIES := \
# Vogar uses android.jar.
LOCAL_CLASSPATH := $(call resolve-prebuilt-sdk-jar-path,current)
-LOCAL_JAVA_LANGUAGE_VERSION := 1.7
include $(BUILD_HOST_JAVA_LIBRARY)
@@ -66,8 +65,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
objenesis \
vogar
-LOCAL_JAVA_LANGUAGE_VERSION := 1.7
-
include $(BUILD_HOST_JAVA_LIBRARY)
# Build dependencies.