commit bb57b6e032652f835b03414e22e52904ad6ba458
author Yohann Roussel <yroussel@google.com> Fri May 23 14:36:03 2014 +0200
committer Yohann Roussel <yroussel@google.com> Mon May 26 11:57:46 2014 +0200
tree 0194cde3d58765aec86a3b30b57e4563d8633e6c
parent d2d0e823a55bc5850a62695b709f924edf126513

Force dx compilation target to java 6.

Because we want it to be executable on a java 6 runtime.

Change-Id: Ie6b62244b11b1b4a54b5a879cec589c66bdf3c4d

dx/src/Android.mk

diff --git a/dx/src/Android.mk b/dx/src/Android.mk
index 4d86ac3..e53144d 100644
--- a/dx/src/Android.mk
+++ b/dx/src/Android.mk
@@ -15,6 +15,10 @@
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE:= dx
 
+# Force java 6 target because we want java 6 runtimes to run dx, at least as long as the android SDK
+# requirement JDK 6.
+LOCAL_JAVACFLAGS:= -source 6 -target 6
+
 include $(BUILD_HOST_JAVA_LIBRARY)
 
 INTERNAL_DALVIK_MODULES += $(LOCAL_INSTALLED_MODULE)