From 22bc1a287eb6c0e7b89001424c895dd776f9a28b Mon Sep 17 00:00:00 2001 From: tgore Date: Mon, 31 Mar 2014 11:55:40 +0100 Subject: [PATCH] intel-gpu-tools: avoid include of cairo.h on Android builds A recent commit means igt_debugfs.c now needs to include igt_kms.h, which in turn includes igt_fb.h and hence cairo.h. We need to avoid this inclusion of cairo.h when building for Android, (until we have a cairo port) so I have added a #ifndef around it. Signed-off-by: Tim Gore Signed-off-by: Daniel Vetter --- lib/Android.mk | 3 ++- lib/igt_fb.h | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/Android.mk b/lib/Android.mk index 67352553..d4ebef4a 100644 --- a/lib/Android.mk +++ b/lib/Android.mk @@ -33,7 +33,8 @@ include $(LOCAL_PATH)/Makefile.sources skip_lib_list := \ igt_kms.c \ - igt_kms.h + igt_kms.h \ + igt_fb.c lib_list := $(filter-out $(skip_lib_list),$(libintel_tools_la_SOURCES)) diff --git a/lib/igt_fb.h b/lib/igt_fb.h index 5f0ff51c..7242f9bd 100644 --- a/lib/igt_fb.h +++ b/lib/igt_fb.h @@ -28,7 +28,12 @@ #ifndef __IGT_FB_H__ #define __IGT_FB_H__ +#ifndef ANDROID #include +#else +typedef struct _cairo_surface cairo_surface_t; +typedef struct _cairo cairo_t; +#endif #include #include