diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-10-27 15:16:33 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-10-27 15:18:36 +0200 |
| commit | 8de4c5d4ea157ef92631582ea5e5a2ec212d38ac (patch) | |
| tree | e9eee1919dc61d1a9a70fe1dcc98d4da3d627328 | |
| parent | The configuration pruning with mobile-config.py seems to work now (diff) | |
| download | core-8de4c5d4ea157ef92631582ea5e5a2ec212d38ac.tar.gz core-8de4c5d4ea157ef92631582ea5e5a2ec212d38ac.zip | |
Do the configuration pruning only in the DISABLE_UI case
Change-Id: If85c6a86434c0aa32d188a0f128f6b6cd613bbb5
| -rw-r--r-- | android/Bootstrap/Makefile.shared | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index 984f3680d3a1..8389241cf9eb 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 |