[Libreoffice-commits] .: Makefile.top

[Libreoffice Gerrit user]

 Makefile.top |    4 ----
 1 file changed, 4 deletions(-)

New commits:
commit 4c1c61ce5701a3d2d273892dc8412eee08d0dca4
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Nov 7 00:42:11 2012 +0200

    Revert "Try this crack then instead: explioitly build freetype first for Android"
    
    Nah, that didn't work either, cairo needs fontconfig, too, and that
    needs expat, it gets complicated, sigh.
    
    This reverts commit 35d5eeff13ae7ed91c27f05b8d8411039ac43d64.

diff --git a/Makefile.top b/Makefile.top
index bab03ff..1a56a3a 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -411,10 +411,6 @@ ifeq ($(DISABLE_DBCONNECTIVITY),TRUE)
 # Ditto for dbconnectivity in the --disable-database-connectivity case
 	cd connectivity && sed -e 's/^\(export [A-Z0-9_]*=\)\(.*\)$$/\1"\2"/' <../config_host.mk >conftmp.sh && . conftmp.sh && rm conftmp.sh && $(SOLARENV)/bin/deliver.pl
 endif
-ifeq ($(OS),ANDROID)
-# Cairo needs freetype
-	cd freetype && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS)
-endif
 	cd packimages && unset MAKEFLAGS && \
 		$(SOLARENV)/bin/build.pl -P$(PARALLELISM) --all -- -P$(PARALLELISM) && \
 		$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS)