lokdocview: adapt Android path

Change-Id: I786fd580b3d08fa076eeb2bf90bd23b09c9f8182

.gitignore

@@ -31,7 +31,7 @@
 
 # autoconf generated stuff
 /aclocal.m4
-/android/experimental/LOAndroid3/AndroidManifest.xml
+/android/source/AndroidManifest.xml
 /autom4te.cache
 /autogen.input
 /autogen.lastrun

Makefile.in

@@ -43,7 +43,7 @@ $(BUILDDIR)/config_host.mk : $(wildcard \
 		$(SRCDIR)/instsetoo_native/util/openoffice.lst.in \
 		$(SRCDIR)/configure.ac \
 		$(SRCDIR)/config_host/*.h.in \
-		$(SRCDIR)/android/experimental/LOAndroid3/AndroidManifest.xml.in \
+		$(SRCDIR)/android/source/AndroidManifest.xml.in \
 		$(BUILDDIR)/autogen.input \
 		$(BUILDDIR)/autogen.lastrun \
 		$(BUILDDIR)/autogen.sh \
@@ -172,7 +172,7 @@ distclean : clean compilerplugins-clean
 	rm -fr \
         $(BUILDDIR)/Makefile \
         $(BUILDDIR)/aclocal.m4 \
-        $(BUILDDIR)/android/experimental/LOAndroid3/AndroidManifest.xml \
+        $(BUILDDIR)/android/source/AndroidManifest.xml \
         $(BUILDDIR)/autom4te.cache \
         $(BUILDDIR)/config.log \
         $(BUILDDIR)/config.Build.log \

README.cross

@@ -353,7 +353,7 @@ And here is an (quite old) autogen.input for Android on X86:
 --with-distro=LibreOfficeAndroidX86
 
 A LibreOffice app for Android is being developed progress in the
-android/experimental/LOAndroid3 directory.
+android/source directory.
 
 To run the app, do "make install" followed by either "make run" or
 starting it from Android itself. You most likely want to have an "adb logcat"

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)"

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

configure.ac

@@ -360,8 +360,8 @@ if test -n "$with_android_ndk"; then
     # Check if there is a 64-bit tool-chain. Google provides a NDK with 64-bit tool-chain binaries in
     # NDK r8e and later, and for earlier NDKs it was possible to build one yourself. Using a 64-bit
     # linker is required if you compile large parts of the code with -g. A 32-bit linker just won't
-    # manage to link the (app-specific) single huge .so that is built for the apps in
-    # android/experimental/* if there is debug information in a significant part of the object files.
+    # manage to link the (app-specific) single huge .so that is built for the app in
+    # android/source/ if there is debug information in a significant part of the object files.
     # (A 64-bit ld.gold grows to much over 10 gigabytes of virtual space when linking such a .so if
     # all objects have been built with debug information.)
     toolchain_system='*'

libreofficekit/source/gtk/lokdocview.cxx

@@ -31,7 +31,7 @@
 #endif
 
 // Cursor bitmaps from the Android app.
-#define CURSOR_HANDLE_DIR "android/experimental/LOAndroid3/res/drawable/"
+#define CURSOR_HANDLE_DIR "android/source/res/drawable/"
 // Number of handles around a graphic selection.
 #define GRAPHIC_HANDLE_COUNT 8