flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-12 02:16:17 +00:00
Code Issues Releases Wiki Activity

intel-gpu-tools: avoid include of cairo.h on Android builds

Browse Source 
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>
This commit is contained in:
tgore 2014-03-31 11:55:40 +01:00 committed by Daniel Vetter
parent 4fdca96066
commit 22bc1a287e
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Android.mk
View File

@ -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))

5
lib/igt_fb.h
View File

@ -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>