On Thursday, 2018-03-29 00:19:00 +0200, Stefan Schake wrote: > The fallback path for no libunwind ends up being stubs for Android. > Don't compile them in so we can provide our own implementation. > > Signed-off-by: Stefan Schake <stsch...@gmail.com> > --- > src/gallium/auxiliary/util/u_debug_stack.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/gallium/auxiliary/util/u_debug_stack.c > b/src/gallium/auxiliary/util/u_debug_stack.c > index 846f648..5cbb54f 100644 > --- a/src/gallium/auxiliary/util/u_debug_stack.c > +++ b/src/gallium/auxiliary/util/u_debug_stack.c > @@ -194,7 +194,7 @@ debug_backtrace_print(FILE *f, > } > } > > -#else /* ! HAVE_LIBUNWIND */ > +#elif !defined(ANDROID) /* ! HAVE_LIBUNWIND */
I think I would prefer this, which is easier to extend in the future: #elif defined(ANDROID) /* Not implemented here; see u_debug_stack_android.cpp */ #else /* ! HAVE_LIBUNWIND */ But other than this, the series looks good to me :) This patch (preferably with the amendment I suggested) is: Reviewed-by: Eric Engestrom <eric.engest...@imgtec.com> The other one is: Acked-by: Eric Engestrom <eric.engest...@imgtec.com> (I don't know the Android API enough, but it all looks reasonable) > > #if defined(PIPE_OS_WINDOWS) > #include <windows.h> > -- > 2.7.4 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev