[Libreoffice-commits] core.git: external/cairo

[Christian Lohmaier]

 external/cairo/ExternalProject_cairo.mk |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit dad3c6752e44d81cbba9c0a81dd776158ee2b7b3
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Thu Dec 17 18:42:25 2015 +0100

    Android: cairo build needs fontconfig and png headers
    
    Change-Id: If7c2279281851b3234ab5982e3c34058a7b8f50c

diff --git a/external/cairo/ExternalProject_cairo.mk b/external/cairo/ExternalProject_cairo.mk
index d204514..ca54bfc 100644
--- a/external/cairo/ExternalProject_cairo.mk
+++ b/external/cairo/ExternalProject_cairo.mk
@@ -11,6 +11,11 @@ $(eval $(call gb_ExternalProject_ExternalProject,cairo))
 
 $(eval $(call gb_ExternalProject_use_external_project,cairo,pixman))
 
+ifeq ($(OS),ANDROID)
+$(eval $(call gb_ExternalProject_use_unpacked,cairo,fontconfig))
+$(eval $(call gb_ExternalProject_use_unpacked,cairo,png))
+endif
+
 $(eval $(call gb_ExternalProject_register_targets,cairo,\
 	build \
 ))