diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2012-01-18 10:48:26 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-01-18 23:15:44 +0200 |
| commit | fa83e46653536821fa70d37d9e4e0ed98538e522 (patch) | |
| tree | 5820ff29c243e254732677cf771054500c0fd56c /android | |
| parent | Use osl API to access files in the SvFileStream code (diff) | |
| download | core-fa83e46653536821fa70d37d9e4e0ed98538e522.tar.gz core-fa83e46653536821fa70d37d9e4e0ed98538e522.zip | |
No need to unpack the .res files any more
Diffstat (limited to 'android')
| -rw-r--r-- | android/qa/sc/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile index d02379111fcd..67fa5674b24e 100644 --- a/android/qa/sc/Makefile +++ b/android/qa/sc/Makefile @@ -137,11 +137,11 @@ copy-stuff: sed -e 's!uri="./!uri="$(APP_DATA_PATH)/lib/!g' <$(SRC_ROOT)/testtools/$(INPATH)/lib/$$F.rdb >assets/lib/$$F.rdb; \ done cp -R $(OUTDIR)/xml/registry assets/xml -# Then assets that are unpacked at run-time into the app's data directory. - mkdir -p assets/unpack/bin +# .res files for F in $(OUTDIR)/bin/*.res; do \ - cp $$F assets/unpack/bin; \ + cp $$F assets/bin; \ done +# Then assets that are unpacked at run-time into the app's data directory. mkdir -p assets/unpack/etc/fonts cp fonts.conf assets/unpack/etc/fonts # @@ -164,7 +164,7 @@ uninstall: adb uninstall $(APP_PACKAGE) run: - echo "STAR_RESOURCEPATH=$(APP_DATA_PATH)/bin FONTCONFIG_FILE=$(APP_DATA_PATH)/etc/fonts/fonts.conf $(APP_DATA_PATH)/lib/libtest_sc_ucalc.so --headless --protector libunoexceptionprotector.so unoexceptionprotector '-env:CONFIGURATION_LAYERS=xcsxcu:file:///assets/xml/registry' '-env:UNO_TYPES=file:///assets/bin/udkapi.rdb file:///assets/bin/types.rdb' '-env:UNO_SERVICES=file:///assets/xml/ure/services.rdb file:///assets/ComponentTarget/framework/util/fwk.component file:///assets/ComponentTarget/i18npool/util/i18npool.component file:///assets/ComponentTarget/sfx2/util/sfx.component file:///assets/ComponentTarget/unoxml/source/service/unoxml.component file:///assets/ComponentTarget/configmgr/source/configmgr.component file:///assets/ComponentTarget/ucb/source/core/ucb1.component file:///assets/ComponentTarget/ucb/source/ucp/file/ucpfile1.component' -env:URE_INTERNAL_LIB_DIR=file://$(APP_DATA_PATH)/lib -env:LO_LIB_DIR=file://$(APP_DATA_PATH)/lib" >cmdline + echo "STAR_RESOURCEPATH=/assets/bin FONTCONFIG_FILE=$(APP_DATA_PATH)/etc/fonts/fonts.conf $(APP_DATA_PATH)/lib/libtest_sc_ucalc.so --headless --protector libunoexceptionprotector.so unoexceptionprotector '-env:CONFIGURATION_LAYERS=xcsxcu:file:///assets/xml/registry' '-env:UNO_TYPES=file:///assets/bin/udkapi.rdb file:///assets/bin/types.rdb' '-env:UNO_SERVICES=file:///assets/xml/ure/services.rdb file:///assets/ComponentTarget/framework/util/fwk.component file:///assets/ComponentTarget/i18npool/util/i18npool.component file:///assets/ComponentTarget/sfx2/util/sfx.component file:///assets/ComponentTarget/unoxml/source/service/unoxml.component file:///assets/ComponentTarget/configmgr/source/configmgr.component file:///assets/ComponentTarget/ucb/source/core/ucb1.component file:///assets/ComponentTarget/ucb/source/ucp/file/ucpfile1.component' -env:URE_INTERNAL_LIB_DIR=file://$(APP_DATA_PATH)/lib -env:LO_LIB_DIR=file://$(APP_DATA_PATH)/lib" >cmdline adb push cmdline $(APP_DATA_PATH)/cmdline adb shell am start -n $(APP_PACKAGE)/$(BOOTSTRAP) -e lo-main-library libcppunittester -e lo-main-indirect-cmdline "$(APP_DATA_PATH)/cmdline" |