| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import("//build/config/ui.gni") | 5 import("//build/config/ui.gni") |
| 6 import("//build/config/compiler/compiler.gni") | 6 import("//build/config/compiler/compiler.gni") |
| 7 import("//build/config/sanitizers/sanitizers.gni") | 7 import("//build/config/sanitizers/sanitizers.gni") |
| 8 | 8 |
| 9 config("mesa_headers_config") { | 9 config("mesa_headers_config") { |
| 10 include_dirs = [ "src/include" ] | 10 include_dirs = [ "src/include" ] |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 # configs.) | 122 # configs.) |
| 123 config("mesa_internal_warnings") { | 123 config("mesa_internal_warnings") { |
| 124 cflags = [] | 124 cflags = [] |
| 125 if (is_clang) { | 125 if (is_clang) { |
| 126 cflags += [ | 126 cflags += [ |
| 127 "-Wno-tautological-constant-out-of-range-compare", | 127 "-Wno-tautological-constant-out-of-range-compare", |
| 128 "-Wno-mismatched-tags", # Fixed upstream. | 128 "-Wno-mismatched-tags", # Fixed upstream. |
| 129 | 129 |
| 130 # mesa's STATIC_ASSERT() macro expands to an ununused typedef. | 130 # mesa's STATIC_ASSERT() macro expands to an ununused typedef. |
| 131 "-Wno-unused-local-typedef", | 131 "-Wno-unused-local-typedef", |
| 132 | |
| 133 # mesa's flex scanner code uses "register" a lot. | |
| 134 "-Wno-deprecated-register", | |
| 135 ] | 132 ] |
| 136 } | 133 } |
| 137 if (is_win) { | 134 if (is_win) { |
| 138 # TODO(scottmg): http://crbug.com/143877 These should be removed if | 135 # TODO(scottmg): http://crbug.com/143877 These should be removed if |
| 139 # Mesa is ever rolled and the warnings are fixed. | 136 # Mesa is ever rolled and the warnings are fixed. |
| 140 cflags += [ | 137 cflags += [ |
| 141 "/wd4005", # Macro defined twice. | 138 "/wd4005", # Macro defined twice. |
| 142 "/wd4018", # Signed/unsigned mismatch in comparison. | 139 "/wd4018", # Signed/unsigned mismatch in comparison. |
| 143 "/wd4065", # Switch statement contains 'default' but no 'case' labels. | 140 "/wd4065", # Switch statement contains 'default' but no 'case' labels. |
| 144 "/wd4090", # 'Operation' : different 'modifier' qualifiers | 141 "/wd4090", # 'Operation' : different 'modifier' qualifiers |
| (...skipping 638 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 783 deps = [ | 780 deps = [ |
| 784 "//third_party/wayland:wayland_util", | 781 "//third_party/wayland:wayland_util", |
| 785 ] | 782 ] |
| 786 | 783 |
| 787 configs -= [ "//build/config/compiler:chromium_code" ] | 784 configs -= [ "//build/config/compiler:chromium_code" ] |
| 788 configs += [ "//build/config/compiler:no_chromium_code" ] | 785 configs += [ "//build/config/compiler:no_chromium_code" ] |
| 789 | 786 |
| 790 public_configs = [ ":wayland_drm_protocol_config" ] | 787 public_configs = [ ":wayland_drm_protocol_config" ] |
| 791 } | 788 } |
| 792 } | 789 } |
| OLD | NEW |