From: Keith Packard <keithp@keithp.com>
Date: Fri, 24 Jun 2016 19:07:36 +0000 (-0700)
Subject: altosdroid: Deal with multiple installed android SDKs
X-Git-Tag: 1.6.5~1^2~27
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=6d15cf1580563aea90e9c47f5b268c9c7bb9ba26;hp=3374a9069618658a33af54472d8670e3086af1e0

altosdroid: Deal with multiple installed android SDKs

Use the latest SDK's zipalign

Signed-off-by: Keith Packard <keithp@keithp.com>
---

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