summaryrefslogtreecommitdiff
path: root/android/Makefile
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2015-10-11 01:53:29 +0200
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2015-10-11 02:03:13 +0200
commitee8257a1c70eadb7330b0ee99ec3b86fe4084bdf (patch)
treec30c86bfa14fc46d94b2da4a3087be9e972c5772 /android/Makefile
parent8dc648d0f32e94fe283e2d635f236012491819ca (diff)
migrate android build to gradle
move preparation tasks (creating assets/processing files) from the makefile into the gradle script This allows much easier integration into android-studio (just open android/source with android studio after running make to compile the native library) Change-Id: I9a9d6832797c24a7e195a1c7954cd6d20f5a8496
Diffstat (limited to 'android/Makefile')
-rw-r--r--android/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/android/Makefile b/android/Makefile
index 3d7763a4de08..5d877d417d12 100644
--- a/android/Makefile
+++ b/android/Makefile
@@ -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/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)
+ jarsigner --verbose -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ~/.keystore $(BUILDDIR)/android/source/build/outputs/apk/LibreOfficeViewer-strippedUI-release-unsigned.apk $(key)
+ $(ANDROID_SDK_HOME)/build-tools/*/zipalign -v 4 $(BUILDDIR)/android/source/build/outputs/apk/LibreOfficeViewer-strippedUI-release-unsigned.apk $(SIGNED_APK)
@echo
@echo "Resulting signed apk: $(SIGNED_APK)"