summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@suse.com>2012-05-22 20:27:11 +0300
committerTor Lillqvist <tlillqvist@suse.com>2012-05-22 20:35:48 +0300
commit1b4d0bdf88f4aa30580979901c32314be643707d (patch)
tree9f789c1d495a03dc2229f79de1cc8dcb4161e80c /android
parent63d7671b21d0b271eb0604a8cb09b49bebf58e43 (diff)
adb pushing the cmdline file fails to a real device
But it isn't needed here anyway, the "command line" is so short, so just use lo-main-cmdline instead. Change-Id: Icca1b57228584cee5962a33cd0d18873b13b2884
Diffstat (limited to 'android')
-rw-r--r--android/qa/desktop/Makefile4
1 files changed, 1 insertions, 3 deletions
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index 36ad0c88798f..d58a4d4acb17 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -244,9 +244,7 @@ uninstall:
$(ANDROID_SDK_HOME)/platform-tools/adb uninstall $(APP_PACKAGE)
run:
- echo "FONTCONFIG_FILE=$(APP_DATA_PATH)/etc/fonts/fonts.conf -env:INIFILENAME=file:///assets/program/sofficerc" > cmdline
- $(ANDROID_SDK_HOME)/platform-tools/adb push cmdline $(APP_DATA_PATH)/cmdline
- $(ANDROID_SDK_HOME)/platform-tools/adb shell am start -n $(APP_PACKAGE)/$(BOOTSTRAP) -e lo-main-library libmergedlo -e lo-strace yes -e lo-main-indirect-cmdline "$(APP_DATA_PATH)/cmdline"
+ $(ANDROID_SDK_HOME)/platform-tools/adb shell am start -n $(APP_PACKAGE)/$(BOOTSTRAP) -e lo-main-library libmergedlo -e lo-strace yes -e lo-main-cmdline "FONTCONFIG_FILE=$(APP_DATA_PATH)/etc/fonts/fonts.conf -env:INIFILENAME=file:///assets/program/sofficerc"
# add -e lo-strace yes # if you want that
# If you reinstall an app several times, even if you uninstall it