diff options
| author | Bdale Garbee <bdale@gag.com> | 2016-07-04 23:48:32 +0200 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2016-07-04 23:48:32 +0200 |
| commit | 06c3d5420080bc1c6fdfb213a9d616b75611c159 (patch) | |
| tree | e882a83c3a76c82e3a8e832eb3805c0c5c010d0d /altosdroid | |
| parent | eb5bd00b1c5045e64753ba9d066ef5cfce9d5a1e (diff) | |
| parent | ea1ff225f1f450ee3fc377807d1bb7b982bf792d (diff) | |
Merge branch 'branch-1.6' into debian
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 |