diff options
| author | Keith Packard <keithp@keithp.com> | 2015-05-28 22:05:36 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2015-05-28 22:05:36 -0700 |
| commit | e2d54de24df37baa5ff3837334d97f726934ec25 (patch) | |
| tree | b408563520701298cb6de9b8f01d78eafd683ccb | |
| parent | 85013045ca505096064aaf45c312b158d0263d2a (diff) | |
altosdroid: Look for zipalign in the new place too
This build tool moved for some reason...
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | altosdroid/Makefile.am | 15 |
1 files 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 |