diff options
| author | cheyang <cheyang@bytedance.com> | 2020-12-01 14:41:08 +0800 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2020-12-11 09:40:08 -0800 |
| commit | a82561ec7f813171fe27385cb1d61b8179110b2f (patch) | |
| tree | 33028a5f1502e6f424f919a65e7487b293fb571a | |
| parent | 15f44439fdad7cac23bf87521156ced3c039f889 (diff) | |
| download | mesa-a82561ec7f813171fe27385cb1d61b8179110b2f.tar.gz | |
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@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 83d1e2efd0e89191da80b62c048a9b7a471a86a3)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/gallium/auxiliary/Android.mk | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json index 5274baf37ca..94b0ba00805 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 2c3f813ac6e..0dc23ff31f6 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 := \ |