[Libreoffice-commits] core.git: Branch 'feature/droid_calcimpress2' - android/Bootstrap android/experimental

[Michael Meeks]

 android/Bootstrap/Makefile.shared        |    8 +++++++-
 android/experimental/LOAndroid3/Makefile |    1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit c61cdec0f9b16798ba0d3f4f2c25bb29a141d869
Author: Michael Meeks <michael.meeks at 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 7095530..7bc9615 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -135,9 +135,15 @@ copy-stuff:
 	cp $(SRC_ROOT)/readlicense_oo/license/NOTICE assets/notice.txt
 	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