summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-10-27 14:33:51 +0200
committerToma┼ż Vajngerl <tomaz.vajngerl@collabora.com>2014-12-04 23:04:25 +0100
commit0a1e1d9a1f69c0087464e55289aae44d23ea9c64 (patch)
tree29e64d10f59beed6f890e5096fb5df8eb27f97ff
parentd74d96e676347df58a492876fceb3bb7335a0c41 (diff)
The configuration pruning with mobile-config.py seems to work now
Change-Id: I1b1891f0d7d7b8aa407e7da346ff5f8e3cbe8657
-rw-r--r--android/Bootstrap/Makefile.shared4
1 files changed, 3 insertions, 1 deletions
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared
index ecda23309f2c..662e87fa3e45 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -138,7 +138,9 @@ copy-stuff:
rm -Rf assets/share # pre-clean it
mkdir -p assets/share/config
cp -R $(INSTDIR)/share/registry assets/share
-# $(SRC_ROOT)/android/mobile-config.py assets/share/registry/main.xcd assets/share/registry/main.xcd.new && mv assets/share/registry/main.xcd.new assets/share/registry/main.xcd
+ 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; \