diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-05-22 10:13:56 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-05-22 10:39:59 +0100 |
| commit | 3d9dfcca78c2fb3a01ed42627e3b5ed65f2dd400 (patch) | |
| tree | 326a1be5aaddcb2cb443abc2220e014600c7208c | |
| parent | ace21dca6ad66e4399803c61163387fe18b33160 (diff) | |
android: remove duplicate services.rdb from config, and static bits
| -rw-r--r-- | android/qa/desktop/Makefile | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile index 8e9edae247c1..36ad0c88798f 100644 --- a/android/qa/desktop/Makefile +++ b/android/qa/desktop/Makefile @@ -28,7 +28,7 @@ all: build-ant properties: echo sdk.dir=$(ANDROID_SDK_HOME) >local.properties - echo sdk.dir=$(ANDROID_SDK_HOME) >../../Bootstrap/local.properties + echo sdk.dir=$(ANDROID_SDK_HOME) >../../Bootstrap/local.properties buildrcs: # main sofficerc ini ... @@ -51,7 +51,7 @@ buildrcs: 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=file:///assets/program/services/services.rdb <$$BRAND_BASE_DIR/program/services>*' >> 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 @@ -119,15 +119,12 @@ copy-stuff: buildrcs drawinglayerlo \ expwrap.uno \ fileacc \ - fontconfig \ forlo \ foruilo \ - freetype \ fsstorage.uno \ gcc3_uno \ hyphenlo \ i18nisolang1gcc3 \ - i18npaperlo \ i18npool.uno \ i18nutilgcc3 \ icudatalo \ @@ -249,7 +246,7 @@ uninstall: 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-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-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 |