X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2FMakefile.am;h=52a2064b1716255a30803b487e60d20fcf8e6373;hp=d5784483e74663a869df6a1cdb3611563537bb2a;hb=d015cfc1499a263549f52d46e9e5b934fcb94f53;hpb=fcbfb3aea20e564045fc6a86f978cacabfc73226

diff --git a/altosdroid/Makefile.am b/altosdroid/Makefile.am
index d5784483..52a2064b 100644
--- a/altosdroid/Makefile.am
+++ b/altosdroid/Makefile.am
@@ -1,5 +1,8 @@
 if ANDROID
-all_target=bin/AltosDroid-debug.apk bin/AltosDroid-release-unsigned.apk
+all_target=bin/AltosDroid-debug.apk
+if ANDROID_RELEASE
+all_target+=bin/AltosDroid-release.apk
+endif
 else
 all_target=
 endif
@@ -11,7 +14,8 @@ DX=$(SDK)/platform-tools/dx
 ADB=$(SDK)/platform-tools/adb
 AAPT=$(SDK)/platform-tools/aapt
 APKBUILDER=$(SDK)/tools/apkbuilder
-ZIPALIGN=$(SDK)/tools/zipalign
+ZIPALIGN_A=$(SDK)/tools/zipalign
+ZIPALIGN_B=$(SDK)/build-tools/*/zipalign
 
 JAVA_SRC_DIR=src/org/altusmetrum/AltosDroid
 EXT_LIBDIR=libs
@@ -76,12 +80,19 @@ bin/AltosDroid-release-unsigned.apk: $(SRC) $(ALTOSLIB) $(SUPPORT_V4) $(GOOGLE_P
 
 bin/AltosDroid-release.apk: bin/AltosDroid-release-unsigned.apk
 	jarsigner -sigalg SHA1withDSA -digestalg SHA1 \
-	   -keystore release.keystore \
+	   -keystore ~/altusmetrumllc/google-play-release.keystore \
+	   -storepass:file ~/altusmetrumllc/google-play-passphrase \
 	   -signedjar bin/AltosDroid-release-signed.apk \
 	   bin/AltosDroid-release-unsigned.apk AltosDroid
-	$(ZIPALIGN) -f 4 \
-	   bin/AltosDroid-release-signed.apk \
-	   bin/AltosDroid-release.apk
+	if [ -f $(ZIPALIGN_A) ]; then \
+		$(ZIPALIGN_A) -f 4 \
+		   bin/AltosDroid-release-signed.apk \
+		   bin/AltosDroid-release.apk; \
+	else \
+		$(ZIPALIGN_B) -f 4 \
+		   bin/AltosDroid-release-signed.apk \
+		   bin/AltosDroid-release.apk; \
+	fi
 
 release: bin/AltosDroid-release.apk