| commit | e65812427db6609f4327dabc5336a9d07d7a182d | [log] [tgz] |
|---|---|---|
| author | glaznev@webrtc.org <glaznev@webrtc.org> | Fri Sep 19 16:53:46 2014 +0000 |
| committer | glaznev@webrtc.org <glaznev@webrtc.org> | Fri Sep 19 16:53:46 2014 +0000 |
| tree | 3e849c7b38fb1352c6b4888dc843ea30b012273a | |
| parent | fbf3bfe1722b0af73dd77b2dcfa888597b3a1085 [diff] |
Fixing compilation failure in peerconnection_jni.cc with WEBRTC_CHROMIUM_BUILD. Symbol LogcatTraceContext not defined. Submitting on behalf of serya@. Dup of https://webrtc-codereview.appspot.com/29529004/ TEST=Build target libjingle_peerconnection_javalib with applied CL https://codereview.chromium.org/551793003/ BUG=https://crbug.com/383418 R=serya@chromium.org Review URL: https://webrtc-codereview.appspot.com/28529004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7244 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/talk/app/webrtc/java/jni/peerconnection_jni.cc b/talk/app/webrtc/java/jni/peerconnection_jni.cc index e0207e4..ba54071 100644 --- a/talk/app/webrtc/java/jni/peerconnection_jni.cc +++ b/talk/app/webrtc/java/jni/peerconnection_jni.cc
@@ -2686,12 +2686,12 @@ std::string path = JavaToStdString(jni, j_path); if (nativeLevels != webrtc::kTraceNone) { webrtc::Trace::set_level_filter(nativeLevels); -#ifdef ANDROID +#if defined(ANDROID) && !defined(WEBRTC_CHROMIUM_BUILD) if (path != "logcat:") { #endif CHECK_EQ(0, webrtc::Trace::SetTraceFile(path.c_str(), false)) << "SetTraceFile failed"; -#ifdef ANDROID +#if defined(ANDROID) && !defined(WEBRTC_CHROMIUM_BUILD) } else { // Intentionally leak this to avoid needing to reason about its lifecycle. // It keeps no state and functions only as a dispatch point.