[Libreoffice-commits] core.git: Branch 'feature/droid_calcimpress3' - 2 commits - android/Bootstrap android/mobile-config.py

[Tor Lillqvist]

 android/Bootstrap/Makefile.shared |    6 +++---
 android/mobile-config.py          |    1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 7a68c61f0f798dafa92c03a0ab053f695eb9ff3d
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Oct 27 15:17:03 2014 +0200

    We seem to crash unless we have org.openoffice.Office.UI/Factories
    
    Change-Id: Ie172f60a7134173462ff9711a40dc74c94ad8206

diff --git a/android/mobile-config.py b/android/mobile-config.py
index 59ade79..8b1f44e 100755
--- a/android/mobile-config.py
+++ b/android/mobile-config.py
@@ -33,7 +33,6 @@ main_xcd_discard = [
     'org.openoffice.Office.UI/BasicIDEWindowState',
     'org.openoffice.Office.UI/GenericCategories',
     'org.openoffice.Office.UI/ChartWindowState',
-    'org.openoffice.Office.UI/Factories',
     'org.openoffice.Office.UI/BaseWindowState',
     'org.openoffice.Office.UI/BasicIDECommands',
     'org.openoffice.Office.UI/BibliographyCommands',
commit 8de4c5d4ea157ef92631582ea5e5a2ec212d38ac
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Oct 27 15:16:33 2014 +0200

    Do the configuration pruning only in the DISABLE_UI case
    
    Change-Id: If85c6a86434c0aa32d188a0f128f6b6cd613bbb5

diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared
index 984f368..8389241 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -138,14 +138,14 @@ copy-stuff:
 	rm -Rf assets/share # pre-clean it
 	mkdir -p assets/share/config
 	cp -R $(INSTDIR)/share/registry assets/share
-	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
 	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"; \
+		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; \
 	fi
 
 	mkdir -p assets/unpack/program