From 5349537cb3ca127937bc8e0602a7540cf48b4b50 Mon Sep 17 00:00:00 2001 From: Yiwei Zhang Date: Sat, 23 Aug 2025 16:41:09 -0700 Subject: [PATCH] meson/android: amend the condition for libbacktrace libbacktrace compatibility has been dropped since Android 14, so the current flags and deps shall be kept behind api level < 34. Meanwhile, its successor, libunwindstack, has been available since Android 11 (api level 31). So one can hook that up if needed. Reviewed-by: Antonio Ospite Part-of: --- meson.build | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index be9a538ec84..29f4898a7ca 100644 --- a/meson.build +++ b/meson.build @@ -905,10 +905,6 @@ with_libbacktrace = get_option('android-libbacktrace') \ .disable_auto_if(not with_platform_android) \ .allowed() -if with_libbacktrace - cpp_args += '-DWITH_LIBBACKTRACE' -endif - if with_platform_android dep_android_ui = null_dep dep_android_mapper4 = null_dep @@ -919,7 +915,8 @@ if with_platform_android dependency('log'), dependency('sync'), ] - if with_libbacktrace + if with_libbacktrace and get_option('platform-sdk-version') < 34 + cpp_args += '-DWITH_LIBBACKTRACE' dep_android += dependency('backtrace') endif if get_option('platform-sdk-version') >= 26