Browse files

Merge pull request #1957 from mikkle/droid-signing

[droid] Fix signing of APK with recent java/jarsigner versions
  • Loading branch information...
2 parents 3085592 + 175a9a5 commit b06ab720f15c6173158e61f9fcf58003d8b6c802 @theuni theuni committed Dec 19, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 tools/android/packaging/Makefile
View
4 tools/android/packaging/Makefile
@@ -36,7 +36,7 @@ libs= $(DSTLIBS)
multi: x86 arm
@cp images/xbmcapp-debug-skeleton.apk images/xbmcapp-debug-multi-unaligned.apk
@cd xbmc; zip -r -q ../images/xbmcapp-debug-multi-unaligned.apk lib/ assets
- @jarsigner -keystore ~/.android/debug.keystore -storepass android images/xbmcapp-debug-multi-unaligned.apk androiddebugkey
+ @jarsigner -sigalg MD5withRSA -digestalg SHA1 -keystore ~/.android/debug.keystore -storepass android images/xbmcapp-debug-multi-unaligned.apk androiddebugkey
@$(SDKROOT)/tools/zipalign -f 4 images/xbmcapp-debug-multi-unaligned.apk $(XBMCROOT)/xbmcapp-multi-debug.apk
@rm images/xbmcapp-debug-multi-unaligned.apk
@echo "$(XBMCROOT)/xbmcapp-multi-debug.apk created"
@@ -47,7 +47,7 @@ package: extras
@javac -classpath $(SDKROOT)/platforms/$(SDK_PLATFORM)/android.jar:xbmc/obj -d xbmc/obj -sourcepath xbmc/src xbmc/src/org/xbmc/xbmc/*.java
@$(DX) --dex --output=xbmc/classes.dex xbmc/obj
@cd xbmc; zip -r -q ../images/xbmcapp-debug-$(PLATFORM)-unaligned.apk lib/$(PLATFORM) assets classes.dex
- @jarsigner -keystore ~/.android/debug.keystore -storepass android images/xbmcapp-debug-$(PLATFORM)-unaligned.apk androiddebugkey
+ @jarsigner -sigalg MD5withRSA -digestalg SHA1 -keystore ~/.android/debug.keystore -storepass android images/xbmcapp-debug-$(PLATFORM)-unaligned.apk androiddebugkey
@$(SDKROOT)/tools/zipalign -f 4 images/xbmcapp-debug-$(PLATFORM)-unaligned.apk $(XBMCROOT)/xbmcapp-$(PLATFORM)-debug.apk
@rm images/xbmcapp-debug-$(PLATFORM)-unaligned.apk
@echo "$(XBMCROOT)/xbmcapp-$(PLATFORM)-debug.apk created"

0 comments on commit b06ab72

Please sign in to comment.