Android.mk: disable android-libbacktrace to build with Android 14

Android libbacktrace is not available in Android 14

Fixes the following build error:

FAILED: src/util/libmesa_util.a.p/u_debug_stack_android.cpp.o
...
../src/util/u_debug_stack_android.cpp:28:10: fatal error: 'backtrace/Backtrace.h' file not found
         ^~~~~~~~~~~~~~~~~~~~~~~
1 error generated.

Cc: mesa-stable
Reviewed-by: Roman Stratiienko <r.stratiienko@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25963>
(cherry picked from commit 95ad0c750c5891dab3a678f26a74c95edfed87c9)

diff --git a/.pick_status.json b/.pick_status.json
index 5855a541c3345c5fccf3ff65e3755b4a003240cc..8429aa363e38111718e637f3962f445fea78ebcc 100644 (file)
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -294,7 +294,7 @@
         "description": "Android.mk: disable android-libbacktrace to build with Android 14",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null

diff --git a/android/Android.mk b/android/Android.mk
index 24110e25d68458d13f053dafd95390745b87e158..d6e2b7084466c642703342729c359bb7ebcb893b 100644 (file)
--- a/android/Android.mk
+++ b/android/Android.mk
@@ -41,8 +41,8 @@ include $(CLEAR_VARS)
 
 LOCAL_SHARED_LIBRARIES := libc libdl libdrm libm liblog libcutils libz libc++ libnativewindow libsync libhardware
 LOCAL_STATIC_LIBRARIES := libexpat libarect libelf
-LOCAL_HEADER_LIBRARIES := libnativebase_headers hwvulkan_headers libbacktrace_headers
-MESON_GEN_PKGCONFIGS := backtrace cutils expat hardware libdrm:$(LIBDRM_VERSION) nativewindow sync zlib:1.2.11 libelf
+LOCAL_HEADER_LIBRARIES := libnativebase_headers hwvulkan_headers
+MESON_GEN_PKGCONFIGS := cutils expat hardware libdrm:$(LIBDRM_VERSION) nativewindow sync zlib:1.2.11 libelf
 LOCAL_CFLAGS += $(BOARD_MESA3D_CFLAGS)
 
 ifneq ($(filter swrast,$(BOARD_MESA3D_GALLIUM_DRIVERS) $(BOARD_MESA3D_VULKAN_DRIVERS)),)

diff --git a/android/mesa3d_cross.mk b/android/mesa3d_cross.mk
index 4b271dd822e4f6dc3fe3371de98499d023f00805..4bcbd43d1701a73a15d14c87f2798b696ee7b099 100644 (file)
--- a/android/mesa3d_cross.mk
+++ b/android/mesa3d_cross.mk
@@ -92,6 +92,7 @@ MESON_GEN_NINJA := \
        -Dllvm=$(if $(MESON_GEN_LLVM_STUB),enabled,disabled)                         \
        -Dcpp_rtti=false                                                             \
        -Dlmsensors=disabled                                                         \
+       -Dandroid-libbacktrace=disabled                                              \
 
 MESON_BUILD := PATH=/usr/bin:/bin:/sbin:$$PATH ninja -C $(MESON_OUT_DIR)/build