diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-01-22 17:03:36 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-01-26 10:27:44 +0100 |
| commit | a791560cb545b548900efd9cf9f73717f12a54e2 (patch) | |
| tree | baf6a7bd1bdbd4ec2c0392766429a19800e7e9de /android | |
| parent | 004695708fac830282fbffd6aac6dcc72887b43d (diff) | |
android: make sure the soffice.cfg directory is always available
Otherwise FSStorageFactory::createInstanceWithArguments() would throw,
resulting in a css::configuration::CorruptedConfigurationException
later, that makes LO throw up its hands in Desktop::Main() and say that
the instset is simply corrupted, there is no point in continuing
further.
Change-Id: I3a401ee77f4fbf1a42a09c5fedd7681b4f32e952
Diffstat (limited to 'android')
| -rw-r--r-- | android/Bootstrap/Makefile.shared | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index 716ced5acba4..77d2bcf8d438 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -138,11 +138,14 @@ copy-stuff: rm -Rf assets/share # pre-clean it mkdir -p assets/share/config cp -R $(INSTDIR)/share/registry assets/share +# Make sure the soffice.cfg directory is always created, it's not possible to hit any keys without it. if ! test z$(DISABLE_UI) = zTRUE; then \ echo "Copying UI files into the apk"; \ cp -R $(INSTDIR)/share/config/soffice.cfg assets/share/config; \ else \ echo "Skipping UI files"; \ + mkdir -p assets/share/config/soffice.cfg; \ + echo > assets/share/config/soffice.cfg/empty; \ for F in main.xcd res/registry_en-US.xcd; do \ $(SRC_ROOT)/android/mobile-config.py assets/share/registry/$$F assets/share/registry/$$F.new && mv assets/share/registry/$$F.new assets/share/registry/$$F; \ done; \ |