[PATCH i-g-t v11 2/7] lib: Include local igt procps, glib header for Android

[Kamil Konieczny]

Hi Jeevaka,
On 2025-05-29 at 17:12:41 +0000, Jeevaka Prabu Badrappan wrote:
> As procps, glib are not available in Android, added local stub
> procps, glib headers to build igt for Android.
> 
> Signed-off-by: Jeevaka Prabu Badrappan <jeevaka.badrappan at intel.com>
> Acked-by: Zbigniew Kempczyński <zbigniew.kempczynski at intel.com>
> ---
>  lib/igt_aux.c           | 6 +++++-

Please split this into separate patch.

[PATCH i-g-t vNN x/y] lib/igt_aux: Include local igt procps header for Android

>  lib/igt_chamelium.c     | 4 ++++
>  lib/igt_core.c          | 4 ++++
>  lib/igt_rc.h            | 4 ++++
>  lib/intel_batchbuffer.c | 4 ++++

Split rest changes into:

[PATCH i-g-t vNN x/y] lib: Include local igt glib header for Android

>  5 files changed, 21 insertions(+), 1 deletion(-)
> 
> diff --git a/lib/igt_aux.c b/lib/igt_aux.c
> index 2905824a5..92adcf70b 100644
> --- a/lib/igt_aux.c
> +++ b/lib/igt_aux.c
> @@ -55,10 +55,14 @@
>  
>  #ifdef HAVE_LIBPROCPS
>  #  include <proc/readproc.h>
> -#else
> +#elif HAVE_LIBPROC2
>  #  include <libproc2/pids.h>
>  #endif
>  
> +#ifdef ANDROID
> +#include "android/procps.h"
> +#endif
> +

Please move it inside HAVE_LIBPROC... like:

#elif HAVE_LIBPROC2
#  include <libproc2/pids.h>
#else
#  ifdef ANDROID
#    include "android/procps.h"
#  endif
#endif

Regards,
Kamil

>  #endif

>  #include <dirent.h>
>  #ifdef __linux__
>  #  include <libudev.h>
> diff --git a/lib/igt_chamelium.c b/lib/igt_chamelium.c
> index a96e36b5b..d19a78ffa 100644
> --- a/lib/igt_chamelium.c
> +++ b/lib/igt_chamelium.c
> @@ -33,7 +33,11 @@
>  #include <xmlrpc-c/base.h>
>  #include <xmlrpc-c/client.h>
>  #include <pthread.h>
> +#ifndef ANDROID
>  #include <glib.h>
> +#else
> +#include "android/glib.h"
> +#endif
>  #include <pixman.h>
>  #include <cairo.h>
>  
> diff --git a/lib/igt_core.c b/lib/igt_core.c
> index b06cdfd89..c2674a272 100644
> --- a/lib/igt_core.c
> +++ b/lib/igt_core.c
> @@ -55,7 +55,11 @@
>  #include <limits.h>
>  #include <locale.h>
>  #include <uwildmat/uwildmat.h>
> +#ifndef ANDROID
>  #include <glib.h>
> +#else
> +#include "android/glib.h"
> +#endif
>  
>  #include "drmtest.h"
>  #include "i915/gem_create.h"
> diff --git a/lib/igt_rc.h b/lib/igt_rc.h
> index 53e5ce669..d871b3b26 100644
> --- a/lib/igt_rc.h
> +++ b/lib/igt_rc.h
> @@ -25,7 +25,11 @@
>  #ifndef IGT_RC_H
>  #define IGT_RC_H
>  
> +#ifndef ANDROID
>  #include <glib.h>
> +#else
> +#include "android/glib.h"
> +#endif
>  
>  extern GKeyFile *igt_key_file;
>  
> diff --git a/lib/intel_batchbuffer.c b/lib/intel_batchbuffer.c
> index 03ce65ded..af0547281 100644
> --- a/lib/intel_batchbuffer.c
> +++ b/lib/intel_batchbuffer.c
> @@ -26,7 +26,11 @@
>   **************************************************************************/
>  
>  #include <search.h>
> +#ifndef ANDROID
>  #include <glib.h>
> +#else
> +#include "android/glib.h"
> +#endif
>  
>  #include "gpgpu_fill.h"
>  #include "huc_copy.h"
> -- 
> 2.49.0
>