From e2d54de24df37baa5ff3837334d97f726934ec25 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Thu, 28 May 2015 22:05:36 -0700 Subject: [PATCH] altosdroid: Look for zipalign in the new place too This build tool moved for some reason... Signed-off-by: Keith Packard --- altosdroid/Makefile.am | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/altosdroid/Makefile.am b/altosdroid/Makefile.am index 361de13c..52a2064b 100644 --- a/altosdroid/Makefile.am +++ b/altosdroid/Makefile.am @@ -14,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 @@ -83,9 +84,15 @@ bin/AltosDroid-release.apk: bin/AltosDroid-release-unsigned.apk -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 -- 2.30.2