[Mesa-dev] [PATCH 2/2] egl: Use pkg-config for Android NDK build

[Gurchetan Singh]

It's possible to build Mesa for Android using the traditional
autotools workflow [1]. ChromiumOS fetches Android prebuilts and
puts them in a sysroot. We now want to use pkg-config to specify
the location of system headers and libraries [2].

To enable this, let's add the required pkg-config checks and link
against them.

[1] https://developer.android.com/ndk/guides/standalone_toolchain.html
[2] https://chromium-review.googlesource.com/#/c/403237/

v2: Bundle pkg-config checks together (Emil)
v3: Provide further context on standalone NDK Mesa build (Emil)
---
 configure.ac        | 1 +
 src/egl/Makefile.am | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/configure.ac b/configure.ac
index 9b6976f..66ef4ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2052,6 +2052,7 @@ for plat in $egl_platforms; do
 		;;
 
 	android)
+		PKG_CHECK_MODULES([ANDROID], [cutils hardware sync])
 		;;
 
 	*)
diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am
index 83fad15..31d8a6e 100644
--- a/src/egl/Makefile.am
+++ b/src/egl/Makefile.am
@@ -87,6 +87,8 @@ endif
 
 if HAVE_EGL_PLATFORM_ANDROID
 AM_CFLAGS += -DHAVE_ANDROID_PLATFORM
+AM_CFLAGS += $(ANDROID_CFLAGS)
+libEGL_la_LIBADD += $(ANDROID_LIBS)
 dri2_backend_FILES += drivers/dri2/platform_android.c
 endif
 
-- 
2.6.6