diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2014-06-30 07:49:44 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2014-06-30 14:48:04 +0200 |
| commit | d2eeb05da67bd8e205821b92fd028f7c7114e99a (patch) | |
| tree | 82b060560584cedd19bf9aea8b7f4ec2d60ce1a6 /android/Bootstrap | |
| parent | c1d64ca9e4c3f52178548aa435c567672dd9b103 (diff) | |
android: Correct location and name of sofficerc.
Without that, URE_BOOTSTRAP does not get set up, and we are unable to
bootstrap.
Change-Id: I7727e2a9dcbb958e006fadf6243e1ca343633f7e
Diffstat (limited to 'android/Bootstrap')
| -rw-r--r-- | android/Bootstrap/Makefile.shared | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index e16de617ea1e..a337a80a0bb2 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -137,19 +137,15 @@ copy-stuff: mkdir -p assets/share/config cp -R $(INSTDIR)/share/registry assets/share cp -R $(INSTDIR)/share/config/soffice.cfg assets/share/config -# -# Set up rc, the "inifile". See BootstrapMap::getBaseIni(). As this app -# doesn't use soffice_main() (at least I think it shouldn't), the -# rtl::Bootstrap::setIniFilename() call there that hardcodes -# /assets/program/lofficerc isn't executed. Instead the hardcoding of -# /assets/rc in BootstrapMap::getBaseIni() gets used. - echo '[Bootstrap]' > assets/rc - echo 'Logo=1' >> assets/rc - 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_DIR/cache' >> assets/rc - echo 'OSL_SOCKET_PATH=$$APP_DATA_DIR/cache' >> assets/rc + + mkdir -p assets/unpack/program + echo '[Bootstrap]' > assets/unpack/program/sofficerc + echo 'Logo=1' >> assets/unpack/program/sofficerc + echo 'NativeProgress=1' >> assets/unpack/program/sofficerc + echo 'URE_BOOTSTRAP=file:///assets/program/fundamentalrc' >> assets/unpack/program/sofficerc +# echo 'RTL_LOGFILE=file:///dev/log/main' >> assets/unpack/program/sofficerc + echo 'HOME=$$APP_DATA_DIR/cache' >> assets/unpack/program/sofficerc + echo 'OSL_SOCKET_PATH=$$APP_DATA_DIR/cache' >> assets/unpack/program/sofficerc # # Set up fundamentalrc echo '[Bootstrap]' > assets/program/fundamentalrc |