diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-03-19 16:16:55 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-03-23 09:19:05 +0100 |
| commit | b0cb454f4a1060bb18f69a4e54714ca0fe8acf65 (patch) | |
| tree | b101ba8ea677e63a7d02507133e930ba7dfd8d3e /android | |
| parent | 658534d36f87f9ab03d862e57b04ea268b73ccab (diff) | |
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
Diffstat (limited to 'android')
| -rw-r--r-- | android/Bootstrap/Makefile.shared | 2 | ||||
| -rw-r--r-- | android/experimental/LOAndroid3/Makefile | 5 |
2 files changed, 5 insertions, 2 deletions
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 |