[Libreoffice-commits] .: android/qa

Tor Lillqvist tml at kemper.freedesktop.org
Tue May 22 10:44:56 PDT 2012


 android/qa/desktop/Makefile |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 1b4d0bdf88f4aa30580979901c32314be643707d
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Tue May 22 20:27:11 2012 +0300

    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

diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index 36ad0c8..d58a4d4 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


More information about the Libreoffice-commits mailing list