summaryrefslogtreecommitdiffstats
path: root/android/Makefile
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2015-01-22 08:35:40 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-01-26 10:27:43 +0100
commitae924ed3d0a3a9b4f8438c4f1187d8378777bf92 (patch)
tree060ade2c414c020839cd6ac196fd38980aa81aef /android/Makefile
parentandroid: Bind the release/debug setting to --enable-release-build. (diff)
downloadcore-ae924ed3d0a3a9b4f8438c4f1187d8378777bf92.tar.gz
core-ae924ed3d0a3a9b4f8438c4f1187d8378777bf92.zip
android: Rename 'make sign' to 'make release-apk'.
This now also allows to specify the version number; now you want to use: cd android/ make versionCode=<previous_version_num+1> key=<key_name> release-apk Change-Id: I078e8dbbe671969fc3b228ac987cdb9a4a53b281
Diffstat (limited to 'android/Makefile')
-rw-r--r--android/Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/android/Makefile b/android/Makefile
index 8a2bdbd5475a..644d0e6e1638 100644
--- a/android/Makefile
+++ b/android/Makefile
@@ -13,8 +13,11 @@ include $(module_directory)/../solenv/gbuild/partial_build.mk
.PHONY: sign
SIGNED_APK := $(BUILDDIR)/android/experimental/LOAndroid3/bin/LibreOfficeViewer.apk
+RELEASE_APK_USAGE := echo; echo "Usage: make versionCode=<version_num+1> key=<key_name> release-apk"
-sign: build
+release-apk: build
+ @if test -z "$(versionCode)" ; then $(RELEASE_APK_USAGE) ; exit 1 ; fi
+ @if test -z "$(key)" ; then $(RELEASE_APK_USAGE) ; exit 1 ; fi
rm -f $(SIGNED_APK)
jarsigner --verbose -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ~/.keystore $(BUILDDIR)/android/experimental/LOAndroid3/bin/LibreOfficeViewer-release-unsigned.apk $(key)
$(ANDROID_SDK_HOME)/build-tools/*/zipalign -v 4 $(BUILDDIR)/android/experimental/LOAndroid3/bin/LibreOfficeViewer-release-unsigned.apk $(SIGNED_APK)