projects
/
fw
/
altos
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
3374a90
)
altosdroid: Deal with multiple installed android SDKs
author
Keith Packard
<keithp@keithp.com>
Fri, 24 Jun 2016 19:07:36 +0000
(12:07 -0700)
committer
Keith Packard
<keithp@keithp.com>
Thu, 30 Jun 2016 02:17:45 +0000
(19:17 -0700)
Use the latest SDK's zipalign
Signed-off-by: Keith Packard <keithp@keithp.com>
altosdroid/Makefile.am
patch
|
blob
|
history
diff --git
a/altosdroid/Makefile.am
b/altosdroid/Makefile.am
index 295abbc57347ca611fafe3b5890020b03fe2392e..686aeabfc5c6f39dae60a7ca5b33af2d13ccc365 100644
(file)
--- 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