From mboxrd@z Thu Jan 1 00:00:00 1970 From: tim.gore@intel.com Subject: [PATCH] intel-gpu-tools: avoid include of cairo.h on Android builds Date: Mon, 31 Mar 2014 11:55:40 +0100 Message-ID: <1396263340-7240-2-git-send-email-tim.gore@intel.com> References: <1396263340-7240-1-git-send-email-tim.gore@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 23A176E22E for ; Mon, 31 Mar 2014 03:57:28 -0700 (PDT) In-Reply-To: <1396263340-7240-1-git-send-email-tim.gore@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org From: tgore 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 --- 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 6735255..d4ebef4 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 5f0ff51..7242f9b 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 -- 1.9.0