diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-11-07 00:42:11 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-11-07 00:42:11 +0200 |
| commit | 4c1c61ce5701a3d2d273892dc8412eee08d0dca4 (patch) | |
| tree | 7552569db6e41a2f59e53c208715f2a9f4e7cc3b | |
| parent | eb66f794d96a78cfca575f858bc9c65d1dee43b7 (diff) | |
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.
| -rw-r--r-- | Makefile.top | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Makefile.top b/Makefile.top index bab03ff49f4c..1a56a3a7c57a 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) |