diff options
| author | Bdale Garbee <bdale@gag.com> | 2016-07-04 23:47:24 +0200 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2016-07-04 23:47:24 +0200 |
| commit | 2e26d1ab42163988dc26b06b016c3b05efe17659 (patch) | |
| tree | 5736db47fa979abb0e37b0fc3b956cd6cdbe9405 /altosdroid | |
| parent | 639e461ded29a48c155afea12171cbfc191ccfd7 (diff) | |
| parent | 65ed2f588ca596fe9aa559bebd590a2a11b9859b (diff) | |
Merge branch 'master' into branch-1.6
Diffstat (limited to 'altosdroid')
| -rw-r--r-- | altosdroid/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/altosdroid/Makefile.am b/altosdroid/Makefile.am index 295abbc5..686aeabf 100644 --- a/altosdroid/Makefile.am +++ b/altosdroid/Makefile.am @@ -15,7 +15,7 @@ ADB=$(SDK)/platform-tools/adb AAPT=$(SDK)/platform-tools/aapt APKBUILDER=$(SDK)/tools/apkbuilder ZIPALIGN_A=$(SDK)/tools/zipalign -ZIPALIGN_B=$(SDK)/build-tools/*/zipalign +ZIPALIGN_B=$(shell ls $(SDK)/build-tools/*/zipalign | tail -1) JAVA_SRC_DIR=src/org/altusmetrum/AltosDroid EXT_LIBDIR=libs |