KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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@gmail.com>
Reviewed-bu: Kristian H. Kristensen <hoegsber@google.com>
Signed-off-by: Dominik Behr <dbehr@chromium.org>
Acked-by: Dylan Baker <dylan@pnwbakers.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/2435>
This commit is contained in:
Dominik Behr 2019-10-21 18:13:08 -07:00 committed by Marge Bot
parent 940ed5078d
commit c682ea598f
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
meson.build
View File

@ -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

11
src/gallium/auxiliary/meson.build
View File

@ -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',