summaryrefslogtreecommitdiffstats
path: root/android
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2012-01-21 21:55:53 +0000
committerMichael Meeks <michael.meeks@suse.com>2012-01-21 21:55:53 +0000
commit7b0123b9ea3e2f67ea8205cfd38bc5cd28225cb4 (patch)
tree0c59d944e33666b4c0c70928c0952f8ec170f222 /android
parentandroid: print out exception messages that escaped 'main' (diff)
downloadcore-7b0123b9ea3e2f67ea8205cfd38bc5cd28225cb4.tar.gz
core-7b0123b9ea3e2f67ea8205cfd38bc5cd28225cb4.zip
android: hard-code path to 'lofficerc' in assets/
Diffstat (limited to 'android')
-rw-r--r--android/qa/desktop/Makefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index 57dc6a47de7f..4578657a1f80 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -29,10 +29,10 @@ all: build-ant
buildrcs:
# main sofficerc ini ...
mkdir -p assets/program/
- echo "[Bootstrap]" > assets/program/sofficerc
- echo "Logo=1" >> assets/program/sofficerc
- echo "NativeProgress=1" >> assets/program/sofficerc
- echo "URE_BOOTSTRAP=file:///assets/program/fundamentalrc" >> assets/program/sofficerc
+ echo "[Bootstrap]" > assets/program/lofficerc
+ echo "Logo=1" >> assets/program/lofficerc
+ echo "NativeProgress=1" >> assets/program/lofficerc
+ echo "URE_BOOTSTRAP=file:///assets/program/fundamentalrc" >> assets/program/lofficerc
# fundamentalrc ini ...
echo "[Bootstrap]" > assets/program/fundamentalrc
echo "LO_LIB_DIR=file://$(APP_DATA_PATH)/lib/" >> assets/program/fundamentalrc
@@ -186,9 +186,9 @@ uninstall:
adb uninstall $(APP_PACKAGE)
run:
- echo "STAR_RESOURCEPATH=/assets/bin FONTCONFIG_FILE=$(APP_DATA_PATH)/etc/fonts/fonts.conf $(APP_DATA_PATH)/lib/libtest_sc_ucalc.so --headless --protector libunoexceptionprotector.so unoexceptionprotector -env:INIFILENAME=file:///assets/program/sofficerc" >cmdline
+ echo "FONTCONFIG_FILE=$(APP_DATA_PATH)/etc/fonts/fonts.conf -env:INIFILENAME=file:///assets/program/sofficerc" > cmdline
adb push cmdline $(APP_DATA_PATH)/cmdline
- adb shell am start -n $(APP_PACKAGE)/$(BOOTSTRAP) -e lo-main-library libmergedlo -e lo-main-indirect-cmdline "$(APP_DATA_PATH)/cmdline"
+ adb shell am start -n $(APP_PACKAGE)/$(BOOTSTRAP) -e lo-main-library libmergedlo -e lo-main-delay 5 -e lo-strace yes -e lo-main-indirect-cmdline "$(APP_DATA_PATH)/cmdline"
# If you reinstall an app several times, even if you uninstall it
# between, disk space seems to leak that won't get recycled until you