Chromium Code Reviews| Index: webrtc/base/java/src/org/webrtc/Logging.java |
| diff --git a/talk/app/webrtc/java/src/org/webrtc/Logging.java b/webrtc/base/java/src/org/webrtc/Logging.java |
| similarity index 64% |
| rename from talk/app/webrtc/java/src/org/webrtc/Logging.java |
| rename to webrtc/base/java/src/org/webrtc/Logging.java |
| index c2ab274ddfcc8c8e593c0ea0dc576c2b7a489bae..d5c1690cbc340552070ce7ea4e68cf377cf42b42 100644 |
| --- a/talk/app/webrtc/java/src/org/webrtc/Logging.java |
| +++ b/webrtc/base/java/src/org/webrtc/Logging.java |
| @@ -1,41 +1,26 @@ |
| /* |
| - * libjingle |
| - * Copyright 2013 Google Inc. |
| + * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. |
| * |
| - * Redistribution and use in source and binary forms, with or without |
| - * modification, are permitted provided that the following conditions are met: |
| - * |
| - * 1. Redistributions of source code must retain the above copyright notice, |
| - * this list of conditions and the following disclaimer. |
| - * 2. Redistributions in binary form must reproduce the above copyright notice, |
| - * this list of conditions and the following disclaimer in the documentation |
| - * and/or other materials provided with the distribution. |
| - * 3. The name of the author may not be used to endorse or promote products |
| - * derived from this software without specific prior written permission. |
| - * |
| - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED |
| - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF |
| - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO |
| - * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; |
| - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, |
| - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR |
| - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
| - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| + * Use of this source code is governed by a BSD-style license |
| + * that can be found in the LICENSE file in the root of the source |
| + * tree. An additional intellectual property rights grant can be found |
| + * in the file PATENTS. All contributing project authors may |
| + * be found in the AUTHORS file in the root of the source tree. |
| */ |
| package org.webrtc; |
| import java.io.PrintWriter; |
| import java.io.StringWriter; |
| -import java.nio.charset.Charset; |
| import java.util.EnumSet; |
| -/** Java wrapper for WebRTC & libjingle logging. */ |
| +/** Java wrapper for WebRTC logging. */ |
| public class Logging { |
| static { |
| - System.loadLibrary("jingle_peerconnection_so"); |
| + try { |
| + System.loadLibrary("jingle_peerconnection_so"); |
| + } catch (Throwable t) { |
|
phoglund
2015/09/28 13:03:34
Umm, no. No no no no. Don't do this.
First, you s
|
| + } |
| } |
| // Keep in sync with webrtc/common_types.h:TraceLevel. |
| @@ -87,7 +72,10 @@ public class Logging { |
| } |
| public static void log(Severity severity, String tag, String message) { |
| - nativeLog(severity.ordinal(), tag, message); |
| + try { |
| + nativeLog(severity.ordinal(), tag, message); |
| + } catch (Throwable t) { |
| + } |
| } |
| public static void d(String tag, String message) { |