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]
---
Tomasz, I added the suggestions that worked. I tried moving
$(ANDROID_LIBS) and $(BACKTRACE_LIBS) to the hunk in
src/gallium/auxiliary/Makefile.am, but the build no longer worked.
libEGL failed to link.
configure.ac | 3 +++
src/gallium/Automake.inc | 6 ++++++
src/gallium/auxiliary/Makefile.am | 4 ++++
3 files changed, 13 insertions(+)
diff --git a/configure.ac b/configure.ac
index 7a0e4754208..acdb7f1adb4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1831,6 +1831,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 3e21aa71b5c..329c8839e17 100644
--- 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 6b048b8eebf..03908198772 100644
--- 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 += \
--
2.17.0.775.ge144d126d7
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
