diff options
| -rw-r--r-- | android/experimental/LibreOffice4Android/Makefile | 19 | ||||
| -rw-r--r-- | sal/rtl/source/bootstrap.cxx | 12 |
2 files changed, 21 insertions, 10 deletions
diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile index 8a57055fd20c..ea5fbeb3327d 100644 --- a/android/experimental/LibreOffice4Android/Makefile +++ b/android/experimental/LibreOffice4Android/Makefile @@ -45,9 +45,8 @@ copy-stuff: gzip -9 <$(OUTDIR)/bin/types.rdb >assets/gz.unpack/program/types.rdb gzip -9 <$(OUTDIR)/bin/ure/types.rdb >assets/gz.unpack/program/ure/types.rdb # For some reason the vnd.sun.star.expand:$LO_LIB_DIR doesn't seem to work, it expands to empty!? -# So just hardcode the known APP_DATA_PATH for now... for F in xml/services xml/ure/services; do \ - sed -e 's!uri="vnd.sun.star.expand:$$LO_LIB_DIR/!uri="file://$(APP_DATA_PATH)/lib/!g' <$(OUTDIR)/$$F.rdb >assets/$$F.rdb; \ + sed -e 's!uri="vnd.sun.star.expand:$$LO_LIB_DIR/!uri="file://$$APP_DATA_DIR/lib/!g' <$(OUTDIR)/$$F.rdb >assets/$$F.rdb; \ done cp $(SRC_ROOT)/odk/examples/java/DocumentHandling/test/test1.odt \ $(SRC_ROOT)/sc/qa/unit/data/xls/border.xls \ @@ -72,30 +71,30 @@ copy-stuff: echo 'NativeProgress=1' >> assets/rc echo 'URE_BOOTSTRAP=file:///assets/program/fundamentalrc' >> assets/rc # echo 'RTL_LOGFILE=file:///dev/log/main' >> assets/rc - echo "HOME=$(APP_DATA_PATH)/cache" >> assets/rc - echo "OSL_SOCKET_PATH=$(APP_DATA_PATH)/cache" >> assets/rc + echo 'HOME=$$APP_DATA_DIR/cache' >> assets/rc + echo 'OSL_SOCKET_PATH=$$APP_DATA_DIR/cache' >> assets/rc # # Set up fundamentalrc echo '[Bootstrap]' > assets/program/fundamentalrc - echo "LO_LIB_DIR=file:$(APP_DATA_PATH)/lib/" >> assets/program/fundamentalrc - echo "URE_LIB_DIR=file://$(APP_DATA_PATH)/lib/" >> assets/program/fundamentalrc # checkme - is this used to find configs ? + echo 'LO_LIB_DIR=file://$$APP_DATA_DIR/lib/' >> assets/program/fundamentalrc + echo 'URE_LIB_DIR=file://$$APP_DATA_DIR/lib/' >> assets/program/fundamentalrc # checkme - is this used to find configs ? 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' >> 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=$(APP_DATA_PATH)/program/offapi.rdb $(APP_DATA_PATH)/program/oovbaapi.rdb' >> assets/program/fundamentalrc + echo 'URE_MORE_TYPES=$$APP_DATA_DIR/program/offapi.rdb $$APP_DATA_DIR/program/oovbaapi.rdb' >> assets/program/fundamentalrc echo 'URE_MORE_SERVICES=file:///assets/xml/services.rdb <$$BRAND_BASE_DIR/program/services>*' >> assets/program/fundamentalrc # # Set up unorc echo '[Bootstrap]' > assets/program/unorc - echo "URE_INTERNAL_LIB_DIR=file://$(APP_DATA_PATH)/lib/" >> assets/program/unorc - echo 'UNO_TYPES=$(APP_DATA_PATH)/program/ure/types.rdb $(APP_DATA_PATH)/program/types.rdb $${URE_MORE_TYPES}' >> assets/program/unorc + echo 'URE_INTERNAL_LIB_DIR=file://$$APP_DATA_DIR/lib/' >> assets/program/unorc + echo 'UNO_TYPES=$$APP_DATA_DIR/program/ure/types.rdb $$APP_DATA_DIR/program/types.rdb $${URE_MORE_TYPES}' >> assets/program/unorc echo 'UNO_SERVICES=file:///assets/xml/ure/services.rdb $${URE_MORE_SERVICES}' >> assets/program/unorc # # Set up bootstraprc echo '[Bootstrap]' > assets/program/bootstraprc echo 'InstallMode=<installmode>' >> assets/program/bootstraprc echo 'ProductKey=LibreOffice 3.6' >> assets/program/bootstraprc - echo "UserInstallation=file://$(APP_DATA_PATH)" >> assets/program/bootstraprc + echo 'UserInstallation=file://$$APP_DATA_DIR' >> assets/program/bootstraprc # # Set up versionrc echo '[Version]' > assets/program/versionrc diff --git a/sal/rtl/source/bootstrap.cxx b/sal/rtl/source/bootstrap.cxx index 4d9f19090bdf..1f293b5d9f24 100644 --- a/sal/rtl/source/bootstrap.cxx +++ b/sal/rtl/source/bootstrap.cxx @@ -40,6 +40,10 @@ #include <boost/unordered_map.hpp> #include <list> +#ifdef ANDROID +#include <osl/detail/android-bootstrap.h> +#endif + #ifdef IOS #include <premac.h> #import <Foundation/Foundation.h> @@ -509,6 +513,14 @@ bool Bootstrap_Impl::getValue( pData)); return true; } +#ifdef ANDROID + if (key == "APP_DATA_DIR") { + const char *app_data_dir = lo_get_app_data_dir(); + rtl_uString_assign( + value, rtl::OUString(app_data_dir, strlen(app_data_dir), RTL_TEXTENCODING_UTF8).pData); + return true; + } +#endif if (key == "ORIGIN") { rtl_uString_assign( value, |