android: add debugrun Makefile target

Also, if we are at it:

- clean up 'run' as well: since the doc browser is the default activity,
no need to pass the test doc path anymore
- make 'install' not depend on build: a full build would need a toplevel
'make' anyway

Change-Id: Ia55d52f767ab3e0be02a753a95b2aac02f8491cc

3 files changed, 8 insertions, 26 deletions

diff --git a/README.cross b/README.cross
index 109588ea5cb0..efaa8c24ed7a 100644
--- a/README.cross
+++ b/README.cross
@@ -339,13 +339,8 @@ course need an appropriate system image for that.
 Here is an autogen.input for Android on ARM when cross-compiling
 from Linux:
 
---build=x86_64-unknown-linux-gnu
 --enable-dbgutil
---enable-debug
 --enable-werror
---with-android-ndk=/home/tml/android-ndk-r9c
---with-android-ndk-toolchain-version=4.8
---with-android-sdk=/home/tml/adt-bundle-linux/sdk
 --with-distro=LibreOfficeAndroid
 
 And here is an (quite old) autogen.input for Android on X86:
@@ -368,25 +363,9 @@ Note that none of these apps in any way are claimed to be ready for
 end-users. No "beta testing" offers needed, it is painfully obvious
 what problems they have.
 
-To run some of the apps, do "make install" followed by either "make
-run" or starting it from Android itself. You most likely want to have
-an "adb logcat" running in another window.
-
-To debug, do manually what "make run" would do and when the app has
-started, run ndk-gdb.
-
-You can also do that manually; to install:
-
-  <android-sdk-linux>/platform-tools/adb install -r android/experimental/LOAndroid3/bin/LibreOfficeViewer-debug.apk
-
-To see the log:
-
-  <android-sdk-linux>/platform-tools/adb logcat
-
-To debug, install the .apk, run it, and then:
-
-  cd android/experimental/LOAndroid3
-  <android-ndk-r9d>/ndk-gdb --adb=<android-sdk-linux>/platform-tools/adb
+To run some of the apps, do "make install" followed by either "make run" or
+starting it from Android itself. You most likely want to have an "adb logcat"
+running in another window. To debug, run "make debugrun".
 
 NB: If you happen to upgrade to Android SDK Tools 23, and the build (using
 'make verbose=t android') fails for you with:
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared
index 2a8b54500881..5020773b40e2 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -64,7 +64,7 @@ properties:
 	echo "APP_ABI := $(ANDROID_APP_ABI)" > jni/Application.mk
 	echo "APP_PLATFORM := android-15" >> jni/Application.mk
 
-install: build-ant
+install:
 	unset JAVA_HOME && $(ANT) $(if $(VERBOSE)$(verbose),,-quiet) debug install
 	@echo
 	@echo 'Run it with "make run"'
diff --git a/android/experimental/LOAndroid3/Makefile b/android/experimental/LOAndroid3/Makefile
index ecefd10c2f1e..fbcec0ce327d 100644
--- a/android/experimental/LOAndroid3/Makefile
+++ b/android/experimental/LOAndroid3/Makefile
@@ -35,4 +35,7 @@ build-ant: android_version_setup copy-stuff prepare-appcompat link-so properties
 	unset JAVA_HOME && $(ANT) $(if $(VERBOSE)$(verbose),,-quiet) $(if $(ENABLE_RELEASE_BUILD),release,debug)
 
 run:
-	adb shell am start -n $(APP_PACKAGE)/.ui.LibreOfficeUIActivity -e input /assets/test1.odt
+	adb shell am start -n $(APP_PACKAGE)/.ui.LibreOfficeUIActivity
+
+debugrun:
+	$(SYSBASE)/../../../ndk-gdb --start