From a9e363e721f4ce18d803fa6b149df0b1839dd833 Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Tue, 7 Oct 2014 12:49:34 +0000 Subject: [PATCH] Roll chromium_revision c264a05..fc668e2 (297113:298195) Mainly to pick up https://codereview.chromium.org/619723006/ to fix our MSan bot. Summary of changes (git diff c264a05..fc668e2 DEPS): * third_party/boringssl 01fe820..c7dd5f30 * third_party/usrsctp/usrsctplib 8975bd5..d5685d4 * tools/swarming_client 79940aee..33d442a Clang updated 216630:217949 (git diff c264a05..fc668e2 tools/clang/scripts/update.sh) This caused TSan v2 to hit an assert in libjingle_peerconnection_unittest and libjingle_media_unittest, which is why the dlclose call had to be disabled for now (webrtc:3895). BUG=3895 R=henrika@webrtc.org, pbos@webrtc.org Review URL: https://webrtc-codereview.appspot.com/28659004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7385 4adac7df-926f-26a2-2b94-8c16560cd09d --- DEPS | 2 +- .../linux/latebindingsymboltable_linux.cc | 36 ++++++------------- .../linux/latebindingsymboltable_linux.h | 29 ++++----------- 3 files changed, 18 insertions(+), 49 deletions(-) diff --git a/DEPS b/DEPS index ca38476975..0d229dc616 100644 --- a/DEPS +++ b/DEPS @@ -12,7 +12,7 @@ vars = { # Use this googlecode_url variable only if there is an internal mirror for it. # If you do not know, use the full path while defining your new deps entry. "googlecode_url": "http://%s.googlecode.com/svn", - "chromium_revision": "c264a0567ee9417d1ff8d8dc61f3a79f2232ea06", + "chromium_revision": "fc668e2ac96160f88e72a1166f5dbd69ccd13c3a", } # NOTE: Prefer revision numbers to tags for svn deps. Use http rather than diff --git a/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.cc b/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.cc index 4e694fa554..658d55a6f3 100644 --- a/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.cc +++ b/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.cc @@ -1,28 +1,11 @@ /* - * libjingle - * Copyright 2004--2010, Google Inc. + * Copyright (c) 2010 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. */ #include "webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h" @@ -71,12 +54,15 @@ void InternalUnloadDll(DllHandle handle) { // stack trace gets displayed as instead of the actual library // -> it can not be suppressed. // https://code.google.com/p/address-sanitizer/issues/detail?id=89 -#if !defined(ADDRESS_SANITIZER) +// +// Skip dlclose() on ThreadSanitizer since it's hitting an assert. +// https://code.google.com/p/webrtc/issues/detail?id=3895 +#if !defined(ADDRESS_SANITIZER) && !defined(THREAD_SANITIZER) if (dlclose(handle) != 0) { WEBRTC_TRACE(kTraceError, kTraceAudioDevice, -1, "%s", GetDllError()); } -#endif // !defined(ADDRESS_SANITIZER) +#endif // !defined(ADDRESS_SANITIZER) && !defined(THREAD_SANITIZER) #else #error Not implemented #endif diff --git a/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h b/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h index 052390a658..f49931e8bf 100644 --- a/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h +++ b/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h @@ -1,28 +1,11 @@ /* - * libjingle - * Copyright 2004--2010, Google Inc. + * Copyright (c) 2010 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. */ #ifndef WEBRTC_AUDIO_DEVICE_LATEBINDINGSYMBOLTABLE_LINUX_H