diff options
| author | tgore <tim.gore@intel.com> | 2014-03-31 11:55:40 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-03-31 14:09:29 +0200 |
| commit | 22bc1a287eb6c0e7b89001424c895dd776f9a28b (patch) | |
| tree | 288c3283ccb59f9ef88e6c418fe1da956d903129 /lib | |
| parent | 4fdca96066e36cb4d41019e58c8387e0a5e0f2f5 (diff) | |
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 <tim.gore@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Android.mk | 3 | ||||
| -rw-r--r-- | lib/igt_fb.h | 5 |
2 files changed, 7 insertions, 1 deletions
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 <cairo.h> +#else +typedef struct _cairo_surface cairo_surface_t; +typedef struct _cairo cairo_t; +#endif #include <drm_fourcc.h> #include <xf86drmMode.h> |