From 589a744585ca047a2b59127ab50f747cd7c56e32 Mon Sep 17 00:00:00 2001 From: Arun Raghavan Date: Sat, 5 Jun 2021 18:15:33 -0400 Subject: [PATCH] Fix build on Android There's a bit of system integration that we haven't pulled in (as it has transitive dependencies), so we manually stub it out. --- webrtc/rtc_base/system/warn_current_thread_is_deadlocked.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/webrtc/rtc_base/system/warn_current_thread_is_deadlocked.h b/webrtc/rtc_base/system/warn_current_thread_is_deadlocked.h index 4a0ba9d..ae4313e 100644 --- a/webrtc/rtc_base/system/warn_current_thread_is_deadlocked.h +++ b/webrtc/rtc_base/system/warn_current_thread_is_deadlocked.h @@ -14,7 +14,11 @@ namespace webrtc { #if defined(WEBRTC_ANDROID) && !defined(WEBRTC_CHROMIUM_BUILD) +/* webrtc-audio-processing: + * We don't support the Android SDK integration for this, so stub out void WarnThatTheCurrentThreadIsProbablyDeadlocked(); + */ +inline void WarnThatTheCurrentThreadIsProbablyDeadlocked() {} #else inline void WarnThatTheCurrentThreadIsProbablyDeadlocked() {} #endif