gallium: Fix automake for Android (v2)

Chromium OS uses Autotools and pkg-config when building Mesa for
Android. The gallium drivers were failing to find the headers and
libraries for zlib and Android's libbacktrace.

v2:
  - Don't add a check for zlib.pc. configure.ac already checks for
    zlib.pc elsewhere. [for tfiga]
  - Check for backtrace.pc separately from the other Android libs.
    [for tfiga]

Reviewed-by: Tomasz Figa <tfiga@chromium.org>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>

diff --git a/configure.ac b/configure.ac
index 502b1787c626b7b79c433503f8b9128e362ea1d0..f135d05736556a43532d98e5324e7495bb55a84a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1836,6 +1836,9 @@ for plat in $platforms; do
 
     android)
         PKG_CHECK_MODULES([ANDROID], [cutils hardware sync])
+        if test -n "$with_gallium_drivers"; then
+            PKG_CHECK_MODULES([BACKTRACE], [backtrace])
+        fi
         DEFINES="$DEFINES -DHAVE_ANDROID_PLATFORM"
         ;;
 

diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc
index 3e21aa71b5ca10c8374a6b95fc462f71e7b9a8b5..329c8839e17a5e5e6aad9047ddfe2abd7ad05faf 100644 (file)
--- a/src/gallium/Automake.inc
+++ b/src/gallium/Automake.inc
@@ -59,6 +59,12 @@ GALLIUM_COMMON_LIB_DEPS += \
        $(LIBDRM_LIBS)
 endif
 
+if HAVE_PLATFORM_ANDROID
+GALLIUM_COMMON_LIB_DEPS += \
+       $(ANDROID_LIBS) \
+       $(BACKTRACE_LIBS)
+endif
+
 GALLIUM_WINSYS_CFLAGS = \
        -I$(top_srcdir)/src \
        -I$(top_srcdir)/include \

diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am
index 6b048b8eebf6380389d4ce5a3436c2adacd16f1e..0390819877211365d3a6d6ddd726625f5291a13c 100644 (file)
--- a/src/gallium/auxiliary/Makefile.am
+++ b/src/gallium/auxiliary/Makefile.am
@@ -21,6 +21,10 @@ libgallium_la_SOURCES = \
        $(NIR_SOURCES) \
        $(GENERATED_SOURCES)
 
+if HAVE_PLATFORM_ANDROID
+libgallium_la_SOURCES += util/u_debug_stack_android.cpp
+endif
+
 if HAVE_LIBDRM
 
 AM_CFLAGS += \