summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-10-27 15:16:33 +0200
committerToma┼ż Vajngerl <tomaz.vajngerl@collabora.com>2014-12-04 23:04:25 +0100
commit8938d3b256fa297edd14be387b310dcdc47541ac (patch)
tree8287aea16aee1793c349c2b1c2fd8c8aeff76729
parent0a1e1d9a1f69c0087464e55289aae44d23ea9c64 (diff)
Do the configuration pruning only in the DISABLE_UI case
Change-Id: If85c6a86434c0aa32d188a0f128f6b6cd613bbb5
-rw-r--r--android/Bootstrap/Makefile.shared6
1 files changed, 3 insertions, 3 deletions
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared
index 662e87fa3e45..82513df68d1a 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