From 41cbe36bba966fdc96d86031f2db5853e2c59ef4 Mon Sep 17 00:00:00 2001 From: Tim Gore Date: Mon, 12 May 2014 13:39:00 +0100 Subject: intel-gpu-tools: Build tests needing cairo if ANDROID_HAS_CAIRO=1 Until now the tests that depended on libcairo were simply skipped in the android build. Now that I have a cairo port working, build these cairo dependent tests if ANDROID_HAS_CAIRO is set to 1 in the environment. For information on building cairo for IGT on Android see the wiki at: https://securewiki.ith.intel.com/display/GFXCore/IGT+Test+Suite+on+Android Signed-off-by: Tim Gore Signed-off-by: Daniel Vetter --- lib/igt_fb.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/igt_fb.h') diff --git a/lib/igt_fb.h b/lib/igt_fb.h index 7242f9bd..e8bb2a86 100644 --- a/lib/igt_fb.h +++ b/lib/igt_fb.h @@ -28,7 +28,8 @@ #ifndef __IGT_FB_H__ #define __IGT_FB_H__ -#ifndef ANDROID +/* cairo is assumed available on linux. On Android we check for ANDROID_HAS_CAIRO */ +#if (!defined(ANDROID)) || (defined(ANDROID) && ANDROID_HAS_CAIRO) #include #else typedef struct _cairo_surface cairo_surface_t; -- cgit v1.2.3