diff options
| author | glaznev@webrtc.org <glaznev@webrtc.org> | 2014-09-19 16:53:46 +0000 |
|---|---|---|
| committer | glaznev@webrtc.org <glaznev@webrtc.org> | 2014-09-19 16:53:46 +0000 |
| commit | 0d6677d008740e801d3ee803e0b1ff076efd7e53 (patch) | |
| tree | 27a442b7c70ec35ea74ed3dfacb7e762817948ac | |
| parent | ce453652c492556c3b22dcf37df975ed2c3daba1 (diff) | |
| download | talk-0d6677d008740e801d3ee803e0b1ff076efd7e53.tar.gz | |
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/talk@7244 4adac7df-926f-26a2-2b94-8c16560cd09d
| -rw-r--r-- | app/webrtc/java/jni/peerconnection_jni.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/webrtc/java/jni/peerconnection_jni.cc b/app/webrtc/java/jni/peerconnection_jni.cc index e0207e4..ba54071 100644 --- a/app/webrtc/java/jni/peerconnection_jni.cc +++ b/app/webrtc/java/jni/peerconnection_jni.cc @@ -2686,12 +2686,12 @@ JOW(void, Logging_nativeEnableTracing)( 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. |