summaryrefslogtreecommitdiff
path: root/android/Makefile
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2015-01-22 08:57:23 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-01-26 10:27:44 +0100
commit3928932fe3fc758fa6b17c1cb6182519c4a8a9c3 (patch)
treeb59fc03f646124352e8e8e01090f796d57254e4b /android/Makefile
parentae924ed3d0a3a9b4f8438c4f1187d8378777bf92 (diff)
android: 'make release-apk' now also accepts the example document.
Change-Id: I4144d0ed42a50be4fa91f377f78a20c28fda36f6
Diffstat (limited to 'android/Makefile')
-rw-r--r--android/Makefile7
1 files changed, 6 insertions, 1 deletions
diff --git a/android/Makefile b/android/Makefile
index 644d0e6e1638..152b1a77e848 100644
--- a/android/Makefile
+++ b/android/Makefile
@@ -13,14 +13,19 @@ 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"
+RELEASE_APK_USAGE := echo; echo "Usage: make versionCode=<version_num+1> exampleDocument=</absolute/path/example.odt> key=<key_name> release-apk"
release-apk: build
+ # versionCode and key are mandatory, examplDocument is not
@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)
+
+ # the actual signing
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)
+
@echo
@echo "Resulting signed apk: $(SIGNED_APK)"