diff --git a/DEPS b/DEPS index f4c77ead38..ce856a2ba1 100644 --- a/DEPS +++ b/DEPS @@ -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': diff --git a/third_party/abseil-cpp/absl/base/dynamic_annotations.cc b/third_party/abseil-cpp/absl/base/dynamic_annotations.cc index b97fa3a8b4..ae6ec0f775 100644 --- a/third_party/abseil-cpp/absl/base/dynamic_annotations.cc +++ b/third_party/abseil-cpp/absl/base/dynamic_annotations.cc @@ -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 diff --git a/third_party/abseil-cpp/absl/base/dynamic_annotations.h b/third_party/abseil-cpp/absl/base/dynamic_annotations.h index b308e93370..88048b0fbb 100644 --- a/third_party/abseil-cpp/absl/base/dynamic_annotations.h +++ b/third_party/abseil-cpp/absl/base/dynamic_annotations.h @@ -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 diff --git a/third_party/abseil-cpp/rename_dynamic_annotations.sh b/third_party/abseil-cpp/rename_dynamic_annotations.sh index 4fb8949d02..b39017f958 100755 --- a/third_party/abseil-cpp/rename_dynamic_annotations.sh +++ b/third_party/abseil-cpp/rename_dynamic_annotations.sh @@ -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" {} \;