android/qa/desktop/Makefile | 10
++--------
android/qa/desktop/src/org/libreoffice/android/examples/LODesktop.java | 2
++
2 files changed, 4 insertions(+), 8 deletions(-)
New commits:
commit 37445f423fae2fd5903a76fa704696d52ae732e0
Author: Michael Meeks <michael.me...@suse.com>
Date: Fri Dec 14 14:54:40 2012 +0000
android: more cleanup / misc. fixes.
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index c34cdab..3a3562b 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.
@@ -153,8 +150,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 c8e7990..5891cea 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)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
