projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosdroid: Look for zipalign in the new place too
[fw/altos]
/
altosdroid
/
Makefile.am
diff --git
a/altosdroid/Makefile.am
b/altosdroid/Makefile.am
index 1590e0c952697b63cf787588faa8f06534267320..52a2064b1716255a30803b487e60d20fcf8e6373 100644
(file)
--- a/
altosdroid/Makefile.am
+++ b/
altosdroid/Makefile.am
@@
-1,5
+1,8
@@
if ANDROID
if ANDROID
-all_target=bin/AltosDroid-debug.apk bin/AltosDroid-release-unsigned.apk
+all_target=bin/AltosDroid-debug.apk
+if ANDROID_RELEASE
+all_target+=bin/AltosDroid-release.apk
+endif
else
all_target=
endif
else
all_target=
endif
@@
-11,7
+14,8
@@
DX=$(SDK)/platform-tools/dx
ADB=$(SDK)/platform-tools/adb
AAPT=$(SDK)/platform-tools/aapt
APKBUILDER=$(SDK)/tools/apkbuilder
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
JAVA_SRC_DIR=src/org/altusmetrum/AltosDroid
EXT_LIBDIR=libs
@@
-40,6
+44,8
@@
SRC=$(JAVA_SRC) $(DRAWABLES)
all: $(all_target)
all: $(all_target)
+.NOTPARALLEL:
+
$(EXT_LIBDIR):
mkdir -p $(EXT_LIBDIR)
$(EXT_LIBDIR):
mkdir -p $(EXT_LIBDIR)
@@
-74,12
+80,19
@@
bin/AltosDroid-release-unsigned.apk: $(SRC) $(ALTOSLIB) $(SUPPORT_V4) $(GOOGLE_P
bin/AltosDroid-release.apk: bin/AltosDroid-release-unsigned.apk
jarsigner -sigalg SHA1withDSA -digestalg SHA1 \
bin/AltosDroid-release.apk: bin/AltosDroid-release-unsigned.apk
jarsigner -sigalg SHA1withDSA -digestalg SHA1 \
- -keystore release.keystore \
+ -keystore ~/altusmetrumllc/google-play-release.keystore \
+ -storepass:file ~/altusmetrumllc/google-play-passphrase \
-signedjar bin/AltosDroid-release-signed.apk \
bin/AltosDroid-release-unsigned.apk AltosDroid
-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
release: bin/AltosDroid-release.apk