diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-05-21 17:55:28 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-05-21 17:57:38 +0100 |
| commit | 562d8f57f0d684879ae62fb10dcf9dcea2bd213b (patch) | |
| tree | 9feba3c890332e3f722669012a2190cf03498fab /android | |
| parent | 97b096275af7054aed6cc8715e5cb968d7e5163f (diff) | |
lokdocview: adapt Android path
Change-Id: I786fd580b3d08fa076eeb2bf90bd23b09c9f8182
Diffstat (limited to 'android')
| -rw-r--r-- | android/Makefile | 6 | ||||
| -rw-r--r-- | android/README | 4 |
2 files changed, 5 insertions, 5 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)" diff --git a/android/README b/android/README index 6b5e22bdc1dc..513444c9754e 100644 --- a/android/README +++ b/android/README @@ -157,7 +157,7 @@ For instructions on how to build for Android, see README.cross. Attach your device, so 'adb devices' shows it. Then run: - cd android/experimental/LOAndroid3 + cd android/source ant debug install adb logcat @@ -206,7 +206,7 @@ that, you must set it to "org.libreoffice"), otherwise ndk-gdb will complain: When you have all this, install the .apk to the device, and: - cd android/experimental/LOAndroid3 + cd android/source <android-ndk-r10d>/ndk-gdb --adb=<android-sdk-linux>/platform-tools/adb --start Pretty printers aren't loaded automatically due to the single shared |