summaryrefslogtreecommitdiffstats
path: root/android/Makefile
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-05-21 17:55:28 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-05-21 17:57:38 +0100
commit562d8f57f0d684879ae62fb10dcf9dcea2bd213b (patch)
tree9feba3c890332e3f722669012a2190cf03498fab /android/Makefile
parentandroid: leftover gitignore (diff)
downloadcore-562d8f57f0d684879ae62fb10dcf9dcea2bd213b.tar.gz
core-562d8f57f0d684879ae62fb10dcf9dcea2bd213b.zip
lokdocview: adapt Android path
Change-Id: I786fd580b3d08fa076eeb2bf90bd23b09c9f8182
Diffstat (limited to 'android/Makefile')
-rw-r--r--android/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/android/Makefile b/android/Makefile
index 152b1a77e848..3d7763a4de08 100644
--- a/android/Makefile
+++ b/android/Makefile
@@ -12,7 +12,7 @@ include $(module_directory)/../solenv/gbuild/partial_build.mk
.PHONY: sign
-SIGNED_APK := $(BUILDDIR)/android/experimental/LOAndroid3/bin/LibreOfficeViewer.apk
+SIGNED_APK := $(BUILDDIR)/android/source/bin/LibreOfficeViewer.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
@@ -23,8 +23,8 @@ release-apk: build
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)
+ jarsigner --verbose -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ~/.keystore $(BUILDDIR)/android/source/bin/LibreOfficeViewer-release-unsigned.apk $(key)
+ $(ANDROID_SDK_HOME)/build-tools/*/zipalign -v 4 $(BUILDDIR)/android/source/bin/LibreOfficeViewer-release-unsigned.apk $(SIGNED_APK)
@echo
@echo "Resulting signed apk: $(SIGNED_APK)"