admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Roll chromium_revision bcf2616e8e..911054f7d0 (559838:559863)

Browse Source 
Change log: bcf2616e8e..911054f7d0
Full diff: bcf2616e8e..911054f7d0

Roll chromium third_party 9d65a3cdda..480fd0409d
Change log: 9d65a3cdda..480fd0409d

Changed dependencies:
* src/ios: 289c450460..1562248170
* src/tools: 6e6e398687..6c88721b30
DEPS diff: bcf2616e8e..911054f7d0/DEPS

No update to Clang.

BUG=None
CQ_INCLUDE_TRYBOTS=master.internal.tryserver.corp.webrtc:linux_internal

TBR=phoglund@webrtc.org

Change-Id: I44c7a93cc90729704092b555a6a7ca0fa6846f2a
Reviewed-on: https://webrtc-review.googlesource.com/77765
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Oleh Prypin <oprypin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23304}
This commit is contained in:
Mirko Bonadei 2018-05-18 14:48:08 +02:00 committed by Commit Bot
parent 0a8f43580f
commit 9a6133e1a0
4 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
DEPS
View File

@ -10,7 +10,7 @@ vars = {
'checkout_configuration': 'default',
'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"',
'webrtc_git': 'https://webrtc.googlesource.com',
'chromium_revision': 'bcf2616e8eb74191a038c9ad457344fa0354f420',
'chromium_revision': '911054f7d0f8472be6059cc730e1bf5f593e7010',
'boringssl_git': 'https://boringssl.googlesource.com',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling swarming_client
@ -43,7 +43,7 @@ vars = {
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling Chromium third_party
# and whatever else without interference from each other.
'chromium_third_party_revision': '9d65a3cddae9b8340d4c77b1ae9034d4501935b8',
'chromium_third_party_revision': '480fd0409dba6c239acdb2293f7fc261cc0bf00d',
}
deps = {
# TODO(kjellander): Move this to be Android-only once the libevent dependency
@ -61,7 +61,7 @@ deps = {
'condition': 'checkout_android',
},
'src/ios': {
'url': Var('chromium_git') + '/chromium/src/ios' + '@' + '289c450460f6a2faf57d1ee011ef7595691dd25b',
'url': Var('chromium_git') + '/chromium/src/ios' + '@' + '156224817065015621fb2acf4265c92ffa026b62',
'condition': 'checkout_ios',
},
'src/testing':
@ -175,7 +175,7 @@ deps = {
'src/third_party/yasm/source/patched-yasm':
Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' + 'b98114e18d8b9b84586b10d24353ab8616d4c5fc',
'src/tools':
Var('chromium_git') + '/chromium/src/tools' + '@' + '6e6e39868794fc2bfeaf64502ad903be79616a0b',
Var('chromium_git') + '/chromium/src/tools' + '@' + '6c88721b3022b6b7662d1eacf358dd1f507b97f7',
'src/tools/gyp':
Var('chromium_git') + '/external/gyp.git' + '@' + 'd61a9397e668fa9843c4aa7da9e79460fe590bfb',
'src/tools/swarming_client':

2
third_party/abseil-cpp/absl/base/dynamic_annotations.cc vendored
View File

@ -32,7 +32,7 @@
/* Each function is empty and called (via a macro) only in debug mode.
The arguments are captured by dynamic tools at runtime. */
#if ABSL_DYNAMIC_ANNOTATIONS_EXTERNAL_IMPL == 0 && !defined(__native_client__)
#if ABSL_DYNAMIC_ANNOTATIONS_EXTERNAL_IMPL == 0
#if __has_feature(memory_sanitizer)
#include <sanitizer/msan_interface.h>

16
third_party/abseil-cpp/absl/base/dynamic_annotations.h vendored
View File

@ -191,16 +191,16 @@
#elif defined(ABSL_ANNOTALYSIS_ENABLED)
#define ABSL_ANNOTATE_IGNORE_READS_BEGIN() \
StaticAnnotateIgnoreReadsBegin(__FILE__, __LINE__)
AbslStaticAnnotateIgnoreReadsBegin(__FILE__, __LINE__)
#define ABSL_ANNOTATE_IGNORE_READS_END() \
StaticAnnotateIgnoreReadsEnd(__FILE__, __LINE__)
AbslStaticAnnotateIgnoreReadsEnd(__FILE__, __LINE__)
#define ABSL_ANNOTATE_IGNORE_WRITES_BEGIN() \
StaticAnnotateIgnoreWritesBegin(__FILE__, __LINE__)
AbslStaticAnnotateIgnoreWritesBegin(__FILE__, __LINE__)
#define ABSL_ANNOTATE_IGNORE_WRITES_END() \
StaticAnnotateIgnoreWritesEnd(__FILE__, __LINE__)
AbslStaticAnnotateIgnoreWritesEnd(__FILE__, __LINE__)
#else
#define ABSL_ANNOTATE_IGNORE_READS_BEGIN() /* empty */
@ -282,13 +282,13 @@ void AbslAnnotateIgnoreWritesEnd(const char *file, int line);
allows IGNORE_READS_AND_WRITES to work properly. */
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-function"
static inline void StaticAnnotateIgnoreReadsBegin(const char *file, int line)
static inline void AbslStaticAnnotateIgnoreReadsBegin(const char *file, int line)
ABSL_ATTRIBUTE_IGNORE_READS_BEGIN { (void)file; (void)line; }
static inline void StaticAnnotateIgnoreReadsEnd(const char *file, int line)
static inline void AbslStaticAnnotateIgnoreReadsEnd(const char *file, int line)
ABSL_ATTRIBUTE_IGNORE_READS_END { (void)file; (void)line; }
static inline void StaticAnnotateIgnoreWritesBegin(
static inline void AbslStaticAnnotateIgnoreWritesBegin(
const char *file, int line) { (void)file; (void)line; }
static inline void StaticAnnotateIgnoreWritesEnd(
static inline void AbslStaticAnnotateIgnoreWritesEnd(
const char *file, int line) { (void)file; (void)line; }
#pragma GCC diagnostic pop
#endif

4
third_party/abseil-cpp/rename_dynamic_annotations.sh vendored
View File

@ -52,6 +52,10 @@ for w in \
AnnotateUnpublishMemoryRange \
GetRunningOnValgrind \
RunningOnValgrind \
StaticAnnotateIgnoreReadsBegin \
StaticAnnotateIgnoreReadsEnd \
StaticAnnotateIgnoreWritesBegin \
StaticAnnotateIgnoreWritesEnd \
ValgrindSlowdown \
; do
find absl/ -type f -exec sed -i "s/\b$w\b/Absl$w/g" {} \;