diff options
| author | Chad Versace <[email protected]> | 2018-05-31 19:57:55 -0700 |
|---|---|---|
| committer | Chad Versace <[email protected]> | 2018-06-27 19:58:16 -0700 |
| commit | dc6665422a8fcfce92b8136310f05351aa0cbd5b (patch) | |
| tree | 1466edd4efe61d3d443ca109641a600a42ef2d00 | |
| parent | 2a5121bf355001e2c69ba05e8d9be4ed633c7bf4 (diff) | |
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 <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/gallium/Automake.inc | 6 | ||||
| -rw-r--r-- | src/gallium/auxiliary/Makefile.am | 4 |
3 files changed, 13 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 502b1787c62..f135d057365 100644 --- 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 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 += \ |