From 190577ee9d3b9c242231cf2e8797ebe5c02d160b Mon Sep 17 00:00:00 2001
From: Frank Gevaerts <frank@gevaerts.be>
Date: Wed, 13 Jun 2012 23:43:39 +0200
Subject: [PATCH] Allow building android with java 1.7.

* Specify source and target java versions for android build
* Specify algorithms for jarsigner

Change-Id: I59d743b9e5484ac93b6f9361b1c41f9862964b0f
---
 android/android.make | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/android/android.make b/android/android.make
index 0be3204535..9668902bec 100644
--- a/android/android.make
+++ b/android/android.make
@@ -78,7 +78,7 @@ RES		:= $(wildcard $(ANDROID_DIR)/res/*/*)
 
 CLEANOBJS += bin gen libs data
 
-JAVAC_OPTS += -implicit:none -classpath $(ANDROID_PLATFORM)/android.jar:$(CLASSPATH)
+JAVAC_OPTS += -source 1.6 -target 1.6 -implicit:none -classpath $(ANDROID_PLATFORM)/android.jar:$(CLASSPATH)
 
 .PHONY:
 $(MANIFEST): $(MANIFEST_SRC) $(DIRS)
@@ -148,7 +148,8 @@ endif
 	$(SILENT)rm -f $@
 	$(call PRINTS,SIGN $(subst $(BUILDDIR)/,,$@))jarsigner \
 		-keystore "$(KEYSTORE)" -storepass "android" -keypass "android" \
-		-signedjar $(TEMP_APK2) $(TEMP_APK) "androiddebugkey"
+		-signedjar $(TEMP_APK2) $(TEMP_APK) "androiddebugkey" \
+		-sigalg MD5withRSA -digestalg SHA1
 	$(SILENT)$(ZIPALIGN) -v 4 $(TEMP_APK2) $@ > /dev/null
 
 $(DIRS):
-- 
2.11.4.GIT