mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

android: more cleanup / misc. fixes.

Browse Source
This commit is contained in:
Michael Meeks 2012-12-14 14:54:40 +00:00
parent 44db691206
commit eaf189abf2
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
android/qa/desktop/Makefile
View File

@ -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

2
android/qa/desktop/src/org/libreoffice/android/examples/LODesktop.java
View File

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