Roll clang 257955:259395

third_party/opus/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/arm.gni")
 import("//testing/test.gni")
 
 # If fixed point implementation shall be used (otherwise float).
 use_opus_fixed_point = current_cpu == "arm" || current_cpu == "arm64"
 
@@ skipping 38 matching lines @@
     ]
     args = [
       rebase_path("//third_party/opus/src/celt/arm/arm2gnu.pl", root_build_dir),
       rebase_path("//third_party/opus/src/celt/arm/celt_pitch_xcorr_arm.s",
                   root_build_dir),
       rebase_path("$target_gen_dir/celt_pitch_xcorr_arm_gnu.S", root_build_dir),
     ]
   }
 }
 
+config("opus_warnings") {
+  if (is_clang && !is_nacl) {
+    # TODO(thakis): Remove once silk/macros.h has been fixed
+    cflags = [ "-Wno-expansion-to-defined" ]
+  }
+}
+
 source_set("opus") {
   gypi_values = exec_script("//build/gypi_to_gn.py",
                             [ rebase_path("opus_srcs.gypi") ],
                             "scope",
                             [ "opus_srcs.gypi" ])
   sources = gypi_values.opus_common_sources
 
   defines = [
     "OPUS_BUILD",
     "OPUS_EXPORT=",
   ]
 
   include_dirs = [
     "src/celt",
     "src/silk",
   ]
 
   configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [ "//build/config/compiler:no_chromium_code" ]
+  configs += [
+    "//build/config/compiler:no_chromium_code",
+
+    # Must be after no_chromium_code to have an effect:
+    ":opus_warnings",
+  ]
   public_configs = [ ":opus_config" ]
 
   if (is_win) {
     defines += [
       "USE_ALLOCA",
       "inline=__inline",
     ]
 
     cflags = [
       "/wd4305",  # Disable truncation warning in celt/pitch.c .
@@ skipping 184 matching lines @@
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [
     "//build/config/compiler:no_chromium_code",
     ":opus_test_config",
   ]
 
   deps = [
     ":opus",
   ]
 }