[PATCH i-g-t v6 02/14] lib: Include local igt procps, glib and unwind header for Android

[Kamil Konieczny]

Hi Jeevaka,
On 2025-05-16 at 16:05:39 +0000, Jeevaka Prabu Badrappan wrote:

you need to add description to every patch.

>From subject:
lib: Include local igt procps, glib and unwind header for Android
it seems you do not need unwind here as this was worked-around
in other patch with HAVE_LIBUNWIND. You could add it later if
anyone will write a replacement.

Can we replace glib with other alternatives? As I understand it
there are uses: hash and regex. Hash can be replaced with igt_map()
and for regex why not using pcre lib? See
https://en.wikipedia.org/wiki/Perl_Compatible_Regular_Expressions

+cc Petri Latvala <adrinael at adrinael.net>

Regards,
Kamil

> 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           | 4 ++++
>  lib/igt_chamelium.c     | 4 ++++
>  lib/igt_core.c          | 8 ++++++++
>  lib/igt_rc.h            | 4 ++++
>  lib/intel_batchbuffer.c | 4 ++++
>  5 files changed, 24 insertions(+)
> 
> diff --git a/lib/igt_aux.c b/lib/igt_aux.c
> index f5bf48da6..3eca09cd9 100644
> --- a/lib/igt_aux.c
> +++ b/lib/igt_aux.c
> @@ -53,11 +53,15 @@
>  #include <assert.h>
>  #include <grp.h>
>  
> +#ifndef ANDROID
>  #ifdef HAVE_LIBPROCPS
>  #  include <proc/readproc.h>
>  #else
>  #  include <libproc2/pids.h>
>  #endif
> +#else
> +#include "android/procps.h"
> +#endif
>  
>  #include <dirent.h>
>  #ifdef __linux__
> 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 e1061a2ed..1d7402cb7 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"
> @@ -82,7 +86,11 @@
>  #include "runnercomms.h"
>  
>  #define UNW_LOCAL_ONLY
> +#ifndef ANDROID
>  #include <libunwind.h>
> +#else
> +#include "android/unwind.h"
> +#endif
>  #include <elfutils/libdwfl.h>
>  
>  #ifdef HAVE_LIBGEN_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 f7569e768..caf142949 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
>