diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-12-14 14:54:40 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-02-15 11:41:04 +0000 |
| commit | eaf189abf2a3aa9d64a77ec866204203b51f52a8 (patch) | |
| tree | 37bccee44e910a03fe56dcb5c6163ef6271e4704 | |
| parent | 44db691206bf8b413dd04ffb6c762a539d3f2dc1 (diff) | |
android: more cleanup / misc. fixes.
| -rw-r--r-- | android/qa/desktop/Makefile | 10 | ||||
| -rw-r--r-- | android/qa/desktop/src/org/libreoffice/android/examples/LODesktop.java | 2 |
2 files changed, 4 insertions, 8 deletions
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile index d6c7ef1f941e..c7581a21cb72 100644 --- a/android/qa/desktop/Makefile +++ b/android/qa/desktop/Makefile @@ -1,6 +1,3 @@ -# lo-main-library - parameter denoting which shlib to load and execute -# 'lo_main' from - include ../../../config_host.mk # The default target just builds. @@ -151,8 +148,5 @@ build-ant: android_version_setup copy-stuff link-so properties setup-jars unset JAVA_HOME && $(ANT) debug run: - echo "-env:INIFILENAME=file:///assets/program/sofficerc" > cmdline -# echo "file:///assets/demo/writer.odt" > cmdline - $(ANDROID_SDK_HOME)/platform-tools/adb push cmdline $(APP_DATA_PATH)/cmdline - $(ANDROID_SDK_HOME)/platform-tools/adb shell am start -n org.libreoffice.android.exampless/LODesktop -e lo-main-delay 20 -e lo-main-indirect-cmdline "$(APP_DATA_PATH)/cmdline" -# add -e lo-strace yes # if you want that + $(ANDROID_SDK_HOME)/platform-tools/adb shell am start -n org.libreoffice.android.examples/.LODesktop -e input /asset/test1.odt +# -e lo-main-delay 20 -e lo-strace yes
\ No newline at end of file diff --git a/android/qa/desktop/src/org/libreoffice/android/examples/LODesktop.java b/android/qa/desktop/src/org/libreoffice/android/examples/LODesktop.java index c8e79903057b..5891cea3ee0c 100644 --- a/android/qa/desktop/src/org/libreoffice/android/examples/LODesktop.java +++ b/android/qa/desktop/src/org/libreoffice/android/examples/LODesktop.java @@ -257,6 +257,8 @@ public class LODesktop { super.onCreate(savedInstanceState); + Log.i(TAG, "onCreate - added here\n"); + try { String input = getIntent().getStringExtra("input"); if (input == null) |