Mesa (staging/20.3): android: fix build failure with libbacktrace

[GitLab Mirror]

Module: Mesa
Branch: staging/20.3
Commit: ac1145f704a7042dfced7e9aa268937d73dc2271
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ac1145f704a7042dfced7e9aa268937d73dc2271

Author: cheyang <cheyang at bytedance.com>
Date:   Tue Dec  1 14:41:08 2020 +0800

android: fix build failure with libbacktrace

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 at bytedance.com>
Acked-by: Tapani Pälli <tapani.palli at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7851>
(cherry picked from commit 83d1e2efd0e89191da80b62c048a9b7a471a86a3)

---

 .pick_status.json                | 2 +-
 src/gallium/auxiliary/Android.mk | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 6908543e2bb..a551e08e696 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -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"
     },
diff --git a/src/gallium/auxiliary/Android.mk b/src/gallium/auxiliary/Android.mk
index 664742ff48d..57efc0e1750 100644
--- a/src/gallium/auxiliary/Android.mk
+++ b/src/gallium/auxiliary/Android.mk
@@ -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 := \