Mesa (master): meson: fix debug build on Android

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: c682ea598f72ded39903015ec3188969fe468ff7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c682ea598f72ded39903015ec3188969fe468ff7

Author: Dominik Behr <dbehr at chromium.org>
Date:   Mon Oct 21 18:13:08 2019 -0700

meson: fix debug build on Android

debug_stack functions are implemented in another file for Android.
Also add backtrace library dependency.

Reviewed-by: Chia-I Wu <olvaffe at gmail.com>
Reviewed-bu: Kristian H. Kristensen <hoegsber at google.com>
Signed-off-by: Dominik Behr <dbehr at chromium.org>
Acked-by: Dylan Baker <dylan at pnwbakers.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/2435>

---

 meson.build                       |  3 +++
 src/gallium/auxiliary/meson.build | 11 ++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 86824bd8e8b..cb275e7dcc1 100644
--- a/meson.build
+++ b/meson.build
@@ -786,6 +786,9 @@ if with_platform_android
     dependency('hardware'),
     dependency('sync'),
   ]
+  if with_gallium
+    dep_android += dependency('backtrace')
+  endif
   if get_option('platform-sdk-version') >= 26
     dep_android += dependency('nativewindow')
   endif
diff --git a/src/gallium/auxiliary/meson.build b/src/gallium/auxiliary/meson.build
index e79d2ac8eca..7db7614ebb5 100644
--- a/src/gallium/auxiliary/meson.build
+++ b/src/gallium/auxiliary/meson.build
@@ -246,7 +246,6 @@ files_libgallium = files(
   'util/u_debug_image.h',
   'util/u_debug_refcnt.c',
   'util/u_debug_refcnt.h',
-  'util/u_debug_stack.c',
   'util/u_debug_stack.h',
   'util/u_debug_symbol.c',
   'util/u_debug_symbol.h',
@@ -339,6 +338,16 @@ files_libgallium = files(
   'nir/nir_draw_helpers.h',
 )
 
+if with_platform_android
+  files_libgallium += files(
+    'util/u_debug_stack_android.cpp',
+  )
+else
+  files_libgallium += files(
+    'util/u_debug_stack.c',
+  )
+endif
+
 if dep_libdrm.found()
   files_libgallium += files(
     'renderonly/renderonly.c',