diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-05-23 15:47:25 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-05-28 14:50:50 +0100 |
| commit | e363e668c7e4ead69aaad168c9f23f3e181db5fc (patch) | |
| tree | 2e4918256bc2c882d91e807518437645e3aafa87 /android | |
| parent | ff31d8dff6bc44f0c4acf5ec3ba09392e8c356bf (diff) | |
android: make launcher function as expected - starts writer.
Remove now redundant FONTCONFIG cmdline arguments, and add fallbacks
for not having cmdline arguments in the intent when launching.
Diffstat (limited to 'android')
| -rw-r--r-- | android/Bootstrap/src/org/libreoffice/android/Bootstrap.java | 1 | ||||
| -rw-r--r-- | android/qa/desktop/Makefile | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java index 6f41bf07f8e7..12afc8c2b861 100644 --- a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java +++ b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java @@ -191,7 +191,6 @@ public class Bootstrap extends NativeActivity while (argv.length > 0 && argv[0].matches("[A-Z_]+=.*")) { putenv(argv[0]); - argv = Arrays.copyOfRange(argv, 1, argv.length-1); } // argv[0] will be replaced by android_main() in lo-bootstrap.c by the diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile index 848c18ba96b0..a8987e8d0d59 100644 --- a/android/qa/desktop/Makefile +++ b/android/qa/desktop/Makefile @@ -247,8 +247,10 @@ uninstall: $(ANDROID_SDK_HOME)/platform-tools/adb uninstall $(APP_PACKAGE) run: - $(ANDROID_SDK_HOME)/platform-tools/adb shell am start -n $(APP_PACKAGE)/$(BOOTSTRAP) -e lo-main-library libmergedlo -# add -e lo-strace yes # if you want some stracing action +# 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 $(APP_PACKAGE)/$(BOOTSTRAP) -e lo-strace yes -e lo-main-indirect-cmdline "$(APP_DATA_PATH)/cmdline" +# add -e lo-strace yes # if you want that # 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 |