[Libreoffice-commits] .: cairo/cairo cairo/pixman

[Tor Lillqvist]

 cairo/cairo/makefile.mk  |    2 +-
 cairo/pixman/makefile.mk |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 172fb5b99752bcb171ef4bf8b0ae716f0751be25
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun Jul 3 21:28:48 2011 +0300

    Don't build cairo for Android
    
    We might have to reconsider later, but bypass cairo for now. It won't
    build anyway, as there is no "native" font backend for Android. Sure,
    we could biuld fontconfig and freetype and pretend that is "native",
    but let's see for now.

diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk
index acfa60e..f62c449 100644
--- a/cairo/cairo/makefile.mk
+++ b/cairo/cairo/makefile.mk
@@ -35,7 +35,7 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
 
 .INCLUDE :	settings.mk
 
-.IF "$(SYSTEM_CAIRO)" == "YES"
+.IF "$(SYSTEM_CAIRO)" == "YES" || "$(GUIBASE)" == "android"
 all:
     @echo "Not building cairo."
 .ENDIF
diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk
index ee07c2f..58fcda2 100644
--- a/cairo/pixman/makefile.mk
+++ b/cairo/pixman/makefile.mk
@@ -35,7 +35,7 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
 
 .INCLUDE :	settings.mk
 
-.IF "$(SYSTEM_CAIRO)" == "YES"
+.IF "$(SYSTEM_CAIRO)" == "YES" || "$(GUIBASE)" == "android"
 all:
     @echo "Not building pixman."