summaryrefslogtreecommitdiffstats
path: root/android
diff options
context:
space:
mode:
authorFrank Gevaerts <frank@gevaerts.be>2012-06-13 23:43:39 +0200
committerFrank Gevaerts <frank@gevaerts.be>2012-06-14 00:05:36 +0200
commit190577ee9d3b9c242231cf2e8797ebe5c02d160b (patch)
tree5f5ad4f31c1d0da3ad86c6c9be397c3db453bf04 /android
parentc02bdc3c3c51b8f7a5bd92817546b05b514eedbc (diff)
downloadrockbox-190577ee9d3b9c242231cf2e8797ebe5c02d160b.tar.gz
rockbox-190577ee9d3b9c242231cf2e8797ebe5c02d160b.tar.bz2
rockbox-190577ee9d3b9c242231cf2e8797ebe5c02d160b.zip
Allow building android with java 1.7.
* Specify source and target java versions for android build * Specify algorithms for jarsigner Change-Id: I59d743b9e5484ac93b6f9361b1c41f9862964b0f
Diffstat (limited to 'android')
-rw-r--r--android/android.make5
1 files 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):