Module: Mesa
Branch: main
Commit: 95ad0c750c5891dab3a678f26a74c95edfed87c9
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=95ad0c750c5891dab3a678f26a74c95edfed87c9

Author: Mauro Rossi <issor.or...@gmail.com>
Date:   Sat Oct 14 21:39:37 2023 +0200

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.stratiie...@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25963>

---

 android/Android.mk      | 4 ++--
 android/mesa3d_cross.mk | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/android/Android.mk b/android/Android.mk
index 24110e25d68..d6e2b708446 100644
--- 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 4b271dd822e..4bcbd43d170 100644
--- 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
 

Reply via email to