Roll chromium_revision f156b499f7..f439921f66 (493756:494089)

webrtc/modules/video_coding/BUILD.gn

Index: webrtc/modules/video_coding/BUILD.gn
diff --git a/webrtc/modules/video_coding/BUILD.gn b/webrtc/modules/video_coding/BUILD.gn
index 193066167b59a602dfc1b164bd37e9fbbfa42747..52d0327bfba55cc3a6c74bfa5db44df817119bb9 100644
--- a/webrtc/modules/video_coding/BUILD.gn
+++ b/webrtc/modules/video_coding/BUILD.gn
@@ -146,6 +146,11 @@ rtc_static_library("video_coding_utility") {
   ]
 }
 
+# TODO(ehmaldonado): Remove once http://bugs.webrtc.org/8090 is fixed.
+config("webrtc_h264_config") {
+  cflags = [ "-Wno-thread-safety-attributes" ]
+}
+
 rtc_static_library("webrtc_h264") {
   sources = [
     "codecs/h264/h264.cc",
@@ -166,6 +171,7 @@ rtc_static_library("webrtc_h264") {
   ]
 
   if (rtc_use_h264) {
+    configs += [ ":webrtc_h264_config" ]
     defines += [ "WEBRTC_USE_H264" ]
     if (rtc_initialize_ffmpeg) {
       defines += [ "WEBRTC_INITIALIZE_FFMPEG" ]