Roll chromium_revision d66326c..4df108a (367167:367307)

third_party/gflags/BUILD.gn

Index: third_party/gflags/BUILD.gn
diff --git a/third_party/gflags/BUILD.gn b/third_party/gflags/BUILD.gn
index a2f1c3d4133b599d6f70ace4a79103c38c29a75a..b153cc7ca44149f3f3f2e4619c5fc252ed0b2cf0 100644
--- a/third_party/gflags/BUILD.gn
+++ b/third_party/gflags/BUILD.gn
@@ -13,7 +13,7 @@ if (is_win) {
 }
 
 config("gflags_config") {
- include_dirs = [
+  include_dirs = [
     "$gflags_gen_arch_root/include",  # For configured files.
     "src",  # For everything else.
   ]
@@ -33,18 +33,17 @@ source_set("gflags") {
     "src/gflags_completions.cc",
     "src/gflags_reporting.cc",
   ]
+  cflags = []
   if (is_win) {
     sources += [ "src/windows/port.cc" ]
 
-    cflags = [
+    cflags += [
       "/wd4005",  # WIN32_LEAN_AND_MEAN.
       "/wd4267",  # Conversion from size_t to "type".
     ]
   }
 
-  include_dirs = [
-    "$gflags_gen_arch_root/include/private",  # For config.h
-  ]
+  include_dirs = [ "$gflags_gen_arch_root/include/private" ]  # For config.h
 
   public_configs = [ ":gflags_config" ]
 
@@ -55,5 +54,6 @@ source_set("gflags") {
     # TODO(andrew): Look into fixing this warning upstream:
     # http://code.google.com/p/webrtc/issues/detail?id=760
     configs -= [ "//build/config/clang:extra_warnings" ]
+    cflags += [ "-Wno-unused-local-typedef" ]

[kjellander_webrtc, 2016/01/04 08:20:50]

Hmm, this still fails even if -Wno-unused-local-typedef is passed on the command
line to the failing compile.

   }
 }