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

android: make launcher function as expected - starts writer.

Browse Source 
Remove now redundant FONTCONFIG cmdline arguments, and add fallbacks
for not having cmdline arguments in the intent when launching.
This commit is contained in:
Michael Meeks
2012-05-23 15:47:25 +01:00
parent ff31d8dff6
commit e363e668c7
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
View File

@@ -191,7 +191,6 @@ public class Bootstrap extends NativeActivity
while (argv.length > 0 && while (argv.length > 0 &&
argv[0].matches("[A-Z_]+=.*")) { argv[0].matches("[A-Z_]+=.*")) {
putenv(argv[0]); 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 // argv[0] will be replaced by android_main() in lo-bootstrap.c by the

6
android/qa/desktop/Makefile
View File

@@ -247,8 +247,10 @@ uninstall:
$(ANDROID_SDK_HOME)/platform-tools/adb uninstall $(APP_PACKAGE) $(ANDROID_SDK_HOME)/platform-tools/adb uninstall $(APP_PACKAGE)
run: run:
$(ANDROID_SDK_HOME)/platform-tools/adb shell am start -n $(APP_PACKAGE)/$(BOOTSTRAP) -e lo-main-library libmergedlo # echo "file:///assets/demo/writer.odt" > cmdline
# add -e lo-strace yes # if you want some stracing action # $(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 # 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 # between, disk space seems to leak that won't get recycled until you