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

[Michael Meeks]

 android/Bootstrap/Makefile.shared |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit cca9d7490de115dee13f5616411b7dcee21cbc39
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Tue Sep 30 20:38:55 2014 +0100

    android: package C* fonts as well for interop.
    
    Change-Id: I49c6c4bf0b2ddfb403612ccad90a41e8ae525427

diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared
index 7bc9615..5dd9f4a 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -196,7 +196,11 @@ copy-stuff:
 # vcl/generic/fontmanager/helper.cxx: psp::getFontPath(). UserInstallation is
 # set to the app's data dir above.
 	mkdir -p assets/gz.unpack/user/fonts
-	for F in $(INSTDIR)/share/fonts/truetype/Liberation*.ttf $(INSTDIR)/share/fonts/truetype/Gen*.ttf $(INSTDIR)/share/fonts/truetype/opens___.ttf; do \
+	for F in $(INSTDIR)/share/fonts/truetype/Liberation*.ttf \
+	         $(INSTDIR)/share/fonts/truetype/Caladea-*.ttf \
+	         $(INSTDIR)/share/fonts/truetype/Carlito-*.ttf \
+	         $(INSTDIR)/share/fonts/truetype/Gen*.ttf \
+		 $(INSTDIR)/share/fonts/truetype/opens___.ttf; do \
 		gzip -9 <$$F >assets/gz.unpack/user/fonts/`basename $$F`; \
 	done
 #