diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-05-22 10:13:56 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-06-26 20:22:05 +0100 |
| commit | d091217028c0bcc83fb18873a8d47ef813e5b959 (patch) | |
| tree | 394c91ebd255c5b8aefbc2f3b4969fa95b8fe9e4 /android/qa | |
| parent | d822c6afe6c1a676e9b86d67e599dbcf75512a7c (diff) | |
android: remove duplicate services.rdb from config, and static bits
Diffstat (limited to 'android/qa')
| -rw-r--r-- | android/qa/desktop/Makefile | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile index 2f7cbd0adb14..6564c7f3e207 100644 --- a/android/qa/desktop/Makefile +++ b/android/qa/desktop/Makefile @@ -50,8 +50,8 @@ buildrcs: echo "BRAND_BASE_DIR=file:///assets" >> assets/program/fundamentalrc echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry module:$${BRAND_BASE_DIR}/share/registry/modules res:$${BRAND_BASE_DIR}/share/registry user:$${$$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/registrymodifications.xcu' >> assets/program/fundamentalrc echo 'URE_BIN_DIR=file:///assets/ure/bin/dir/not-here/can-we/exec-anyway' >> assets/program/fundamentalrc - echo 'URE_MORE_TYPES=file:///assets/ure/share/misc/types.rdb file:///assets/program/types/types.rdb' >> assets/program/fundamentalrc - echo 'URE_MORE_SERVICES=<$$BRAND_BASE_DIR/program/services>*' >> assets/program/fundamentalrc + echo 'URE_MORE_TYPES=' >> assets/program/fundamentalrc + echo 'URE_MORE_SERVICES= <$$BRAND_BASE_DIR/program/services>*' >> assets/program/fundamentalrc echo 'BUNDLED_EXTENSIONS=$$BRAND_BASE_DIR/share/extensions' >> assets/program/fundamentalrc echo 'BUNDLED_EXTENSIONS_PREREG=$$BRAND_BASE_DIR/share/prereg/bundled' >> assets/program/fundamentalrc echo 'BUNDLED_EXTENSIONS_USER=$${$$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/extensions/bundled' >> assets/program/fundamentalrc @@ -122,8 +122,6 @@ copy-stuff: buildrcs fileacc \ forlo \ foruilo \ - fpicker.uno \ - fps_office.uno \ fsstorage.uno \ gcc3_uno \ hyphenlo \ @@ -253,8 +251,15 @@ uninstall: $(ANDROID_SDK_HOME)/platform-tools/adb uninstall $(APP_PACKAGE) run: +<<<<<<< HEAD $(ANDROID_SDK_HOME)/platform-tools/adb shell am start -n $(APP_PACKAGE)/$(BOOTSTRAP) # add -e lo-strace "-f -o /somewhere/the/app/can/write.log" if you want +======= + 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" +# add -e lo-strace yes # if you want that +>>>>>>> android: remove duplicate services.rdb from config, and static bits # 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 |