From 35d5eeff13ae7ed91c27f05b8d8411039ac43d64 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tlillqvist@suse.com>
Date: Wed, 7 Nov 2012 00:12:51 +0200
Subject: Try this crack then instead: explioitly build freetype first for
 Android

Change-Id: Ia7674bb1849ef870e540412fd496b2eaddfc09c5
---
 Makefile.top | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'Makefile.top')

diff --git a/Makefile.top b/Makefile.top
index 1a56a3a7c57a..bab03ff49f4c 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -410,6 +410,10 @@ endif
 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) && \
-- 
cgit