[PATCH v4 03/15] tests: Include local igt_glib header for Android

[Zbigniew Kempczyński]

On Wed, May 07, 2025 at 04:01:36PM +0000, Jeevaka Prabu Badrappan wrote:
> Signed-off-by: Jeevaka Prabu Badrappan <jeevaka.badrappan at intel.com>
> ---
>  tests/intel/api_intel_bb.c | 4 ++++
>  tests/intel/gem_ccs.c      | 4 ++++
>  tests/intel/xe_ccs.c       | 4 ++++
>  tests/intel/xe_intel_bb.c  | 4 ++++
>  tests/testdisplay.h        | 4 ++++
>  5 files changed, 20 insertions(+)
> 
> diff --git a/tests/intel/api_intel_bb.c b/tests/intel/api_intel_bb.c
> index 4a1c9be91..3e6c5d632 100644
> --- a/tests/intel/api_intel_bb.c
> +++ b/tests/intel/api_intel_bb.c
> @@ -35,7 +35,11 @@
>  #include <errno.h>
>  #include <sys/stat.h>
>  #include <sys/ioctl.h>
> +#ifndef ANDROID
>  #include <glib.h>
> +#else
> +#include "igt_glib.h"
> +#endif

With comment from first patch addressed:

Acked-by: Zbigniew Kempczyński <zbigniew.kempczynski at intel.com>

--
Zbigniew

>  #include <zlib.h>
>  #include "intel_bufops.h"
>  #include "i915/gem_vm.h"
> diff --git a/tests/intel/gem_ccs.c b/tests/intel/gem_ccs.c
> index af1e85f6a..a18418753 100644
> --- a/tests/intel/gem_ccs.c
> +++ b/tests/intel/gem_ccs.c
> @@ -4,7 +4,11 @@
>   */
>  
>  #include <errno.h>
> +#ifndef ANDROID
>  #include <glib.h>
> +#else
> +#include "igt_glib.h"
> +#endif
>  #include <sys/ioctl.h>
>  #include <sys/time.h>
>  #include <malloc.h>
> diff --git a/tests/intel/xe_ccs.c b/tests/intel/xe_ccs.c
> index e154bf4dc..9e42a0859 100644
> --- a/tests/intel/xe_ccs.c
> +++ b/tests/intel/xe_ccs.c
> @@ -4,7 +4,11 @@
>   */
>  
>  #include <errno.h>
> +#ifndef ANDROID
>  #include <glib.h>
> +#else
> +#include "igt_glib.h"
> +#endif
>  #include <sys/ioctl.h>
>  #include <sys/time.h>
>  #include <malloc.h>
> diff --git a/tests/intel/xe_intel_bb.c b/tests/intel/xe_intel_bb.c
> index d8bd7b519..e0d1e8016 100644
> --- a/tests/intel/xe_intel_bb.c
> +++ b/tests/intel/xe_intel_bb.c
> @@ -6,7 +6,11 @@
>  #include <cairo.h>
>  #include <errno.h>
>  #include <fcntl.h>
> +#ifndef ANDROID
>  #include <glib.h>
> +#else
> +#include "igt_glib.h"
> +#endif
>  #include <inttypes.h>
>  #include <stdio.h>
>  #include <stdlib.h>
> diff --git a/tests/testdisplay.h b/tests/testdisplay.h
> index 27f8209e2..2725637fe 100644
> --- a/tests/testdisplay.h
> +++ b/tests/testdisplay.h
> @@ -24,7 +24,11 @@
>  #include <stdio.h>
>  #include <string.h>
>  #include <stdlib.h>
> +#ifndef ANDROID
>  #include <glib.h>
> +#else
> +#include "igt_glib.h"
> +#endif
>  
>  extern int drm_fd;
>  
> -- 
> 2.34.1
>