android/Bootstrap/Makefile.shared | 8 +++++++-
android/experimental/LOAndroid3/Makefile | 1 +
2 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 28eec2207c763399d07fe01da8858b679d64b322
Author: Michael Meeks <michael.me...@collabora.com>
Date: Tue Sep 30 15:31:00 2014 +0100
android: disable packaging of un-needed UI files.
Appears to save ~10Mb of apk size.
Change-Id: I7c49da979e2868628bf3cf07937e898d717a5071
diff --git a/android/Bootstrap/Makefile.shared
b/android/Bootstrap/Makefile.shared
index a337a80..b5ca272 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -134,9 +134,15 @@ copy-stuff:
assets
cp $(WORKDIR)/ComponentTarget/i18npool/util/i18npool.component
assets/ComponentTarget/i18npool/util
#
+ rm -Rf assets/share # pre-clean it
mkdir -p assets/share/config
cp -R $(INSTDIR)/share/registry assets/share
- cp -R $(INSTDIR)/share/config/soffice.cfg assets/share/config
+ 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"; \
+ fi
mkdir -p assets/unpack/program
echo '[Bootstrap]' > assets/unpack/program/sofficerc
diff --git a/android/experimental/LOAndroid3/Makefile
b/android/experimental/LOAndroid3/Makefile
index 49879c0..a19fadc 100644
--- a/android/experimental/LOAndroid3/Makefile
+++ b/android/experimental/LOAndroid3/Makefile
@@ -9,6 +9,7 @@ all: build-ant
# The package of this app
APP_PACKAGE=org.libreoffice
+DISABLE_UI=TRUE
BOOTSTRAPDIR=../../Bootstrap
include $(BOOTSTRAPDIR)/Makefile.shared
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
