fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 13:28:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

android: fix build failure with libbacktrace

Browse source 
because 848e7b94 commit cause.it  modify u_debug_stack_android.cpp
location from src/gallium/auxiliary/util to src/util but Android.mk
not modify

Fixes: 848e7b94 ("Move stack debug functions to src/util")
Signed-off-by: cheyang <cheyang@bytedance.com>
Acked-by: Tapani Pälli <tapani.palli@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7851>
(cherry picked from commit 83d1e2efd0)
This commit is contained in:
cheyang 2020-12-01 14:41:08 +08:00 • committed by Dylan Baker
parent 15f44439fd
commit a82561ec7f
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -148,7 +148,7 @@
"description": "android: fix build failure with libbacktrace",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "848e7b947d0d505d54d27780b052e5532c721678"
},

4
src/gallium/auxiliary/Android.mk
View file

@ -36,7 +36,9 @@ LOCAL_SRC_FILES := \
$(VL_STUB_SOURCES)
ifeq ($(USE_LIBBACKTRACE),true)
LOCAL_SRC_FILES += util/u_debug_stack_android.cpp
LOCAL_CFLAGS += -DHAVE_ANDROID_PLATFORM
LOCAL_SHARED_LIBRARIES += libbacktrace
LOCAL_SRC_FILES += ../../util/u_debug_stack_android.cpp
endif
LOCAL_C_INCLUDES := \