diff --git a/media/webrtc/signaling/src/common/browser_logging/WebRtcLog.cpp b/media/webrtc/signaling/src/common/browser_logging/WebRtcLog.cpp index 3d8a4a18cb25..adb00b29a70b 100644 --- a/media/webrtc/signaling/src/common/browser_logging/WebRtcLog.cpp +++ b/media/webrtc/signaling/src/common/browser_logging/WebRtcLog.cpp @@ -7,9 +7,6 @@ #include "prlog.h" #include "prenv.h" #include "webrtc/system_wrappers/interface/trace.h" -#ifdef WEBRTC_GONK -#include "webrtc/system_wrappers/interface/logcat_trace_context.h" -#endif #include "nscore.h" #ifdef MOZILLA_INTERNAL_API @@ -56,10 +53,6 @@ public: }; static WebRtcTraceCallback gWebRtcCallback; -#ifdef WEBRTC_GONK -static webrtc::LogcatTraceContext gWebRtcLogcatCallback; -#endif - #ifdef MOZILLA_INTERNAL_API void GetWebRtcLogPrefs(uint32_t *aTraceMask, nsACString* aLogFile, nsACString *aAECLogDir, bool *aMultiLog) @@ -122,13 +115,8 @@ void ConfigWebRtcLog(uint32_t trace_mask, nsCString &aLogFile, nsCString &aAECLo logFile.Append(default_log); } #elif defined(ANDROID) -#ifdef WEBRTC_GONK - // Special case: use callback to log through logcat. - logFile.Assign("logcat"); -#else // Special case: use callback to pipe to NSPR logging. logFile.Assign("nspr"); -#endif // for AEC, force the user to specify a directory aecLogDir.Assign("/dev/null"); #else @@ -149,10 +137,6 @@ void ConfigWebRtcLog(uint32_t trace_mask, nsCString &aLogFile, nsCString &aAECLo if (trace_mask != 0) { if (aLogFile.EqualsLiteral("nspr")) { webrtc::Trace::SetTraceCallback(&gWebRtcCallback); -#ifdef WEBRTC_GONK - } else if (aLogFile.EqualsLiteral("logcat")) { - webrtc::Trace::SetTraceCallback(&gWebRtcLogcatCallback); -#endif } else { webrtc::Trace::SetTraceFile(aLogFile.get(), multi_log); } diff --git a/media/webrtc/trunk/webrtc/build/common.gypi b/media/webrtc/trunk/webrtc/build/common.gypi index ad0f71b8c667..2d8358a9c730 100644 --- a/media/webrtc/trunk/webrtc/build/common.gypi +++ b/media/webrtc/trunk/webrtc/build/common.gypi @@ -188,7 +188,6 @@ ['moz_widget_toolkit_gonk==1', { 'defines' : [ 'WEBRTC_GONK', - 'WEBRTC_DIRECT_TRACE', ], }], ['restrict_webrtc_logging==1', {