diff options
| -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 := \ |