[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - android/Bootstrap

[Miklos Vajna]

 android/Bootstrap/Makefile.shared |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 0a7624023ac3e0d4b9a8ebc14c101646d39cd186
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Jan 22 17:03:36 2015 +0100

    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

diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared
index 716ced5..77d2bcf 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; \