diff options
| author | Tor Lillqvist <tml@iki.fi> | 2011-07-03 21:28:48 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2011-07-03 21:28:54 +0300 |
| commit | 3c4b37d77cbfdb941434e08c9a0955b7e752ee64 (patch) | |
| tree | 528aceeaf1b19df721984d0c6a65586b4341160c | |
| parent | 6c5e6ac64126edf70135a0dd0e01e6dd661bcdfe (diff) | |
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.
| -rw-r--r-- | cairo/cairo/makefile.mk | 2 | ||||
| -rw-r--r-- | cairo/pixman/makefile.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk index acfa60e3402e..f62c44971ada 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 ee07c2f7f699..58fcda2803bd 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." |