summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@suse.com>2012-11-07 00:12:51 +0200
committerTor Lillqvist <tlillqvist@suse.com>2012-11-07 00:12:51 +0200
commit35d5eeff13ae7ed91c27f05b8d8411039ac43d64 (patch)
tree443d86789941ec9c3411cf7d09aeb4a8877efaa7
parent36a3b74d8c205039f45156f8b1f62c78168d4aa9 (diff)
Try this crack then instead: explioitly build freetype first for Android
Change-Id: Ia7674bb1849ef870e540412fd496b2eaddfc09c5
-rw-r--r--Makefile.top4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile.top b/Makefile.top
index 1a56a3a7c57a..bab03ff49f4c 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -411,6 +411,10 @@ 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)