Chromium Code Reviews| 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 | 6 |
| 7 config("mesa_headers_config") { | 7 config("mesa_headers_config") { |
| 8 include_dirs = [ "src/include" ] | 8 include_dirs = [ "src/include" ] |
| 9 if (!use_x11) { | 9 if (!use_x11) { |
| 10 defines = [ "MESA_EGL_NO_X11_HEADERS" ] | 10 defines = [ "MESA_EGL_NO_X11_HEADERS" ] |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 120 cflags = [] | 120 cflags = [] |
| 121 if (is_clang) { | 121 if (is_clang) { |
| 122 cflags += [ | 122 cflags += [ |
| 123 "-Wno-tautological-constant-out-of-range-compare", | 123 "-Wno-tautological-constant-out-of-range-compare", |
| 124 "-Wno-mismatched-tags", # Fixed upstream. | 124 "-Wno-mismatched-tags", # Fixed upstream. |
| 125 | 125 |
| 126 # mesa's STATIC_ASSERT() macro expands to an ununused typedef. | 126 # mesa's STATIC_ASSERT() macro expands to an ununused typedef. |
| 127 "-Wno-unused-local-typedef", | 127 "-Wno-unused-local-typedef", |
| 128 ] | 128 ] |
| 129 } | 129 } |
| 130 if (is_ubsan_vptr) { | |
| 131 # UBsan's vptr is not compatible with -fno-rtti, | |
| 132 # which is used by gallium/auxiliary/Makefile. | |
| 133 cflags += [ "-fno-sanitize=vptr" ] | |
|
Dirk Pranke
2016/04/22 23:04:56
This is dangerous, because this is likely sensitiv
| |
| 134 } | |
| 130 if (is_win) { | 135 if (is_win) { |
| 131 # TODO(scottmg): http://crbug.com/143877 These should be removed if | 136 # TODO(scottmg): http://crbug.com/143877 These should be removed if |
| 132 # Mesa is ever rolled and the warnings are fixed. | 137 # Mesa is ever rolled and the warnings are fixed. |
| 133 cflags += [ | 138 cflags += [ |
| 134 "/wd4005", # Macro defined twice. | 139 "/wd4005", # Macro defined twice. |
| 135 "/wd4018", # Signed/unsigned mismatch in comparison. | 140 "/wd4018", # Signed/unsigned mismatch in comparison. |
| 136 "/wd4065", # Switch statement contains 'default' but no 'case' labels. | 141 "/wd4065", # Switch statement contains 'default' but no 'case' labels. |
| 137 "/wd4090", # 'Operation' : different 'modifier' qualifiers | 142 "/wd4090", # 'Operation' : different 'modifier' qualifiers |
| 138 "/wd4099", # Type name struct-vs-class doesn't match. | 143 "/wd4099", # Type name struct-vs-class doesn't match. |
| 139 "/wd4273", # Inconsistent DLL linkage. | 144 "/wd4273", # Inconsistent DLL linkage. |
| (...skipping 614 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 754 deps = [ | 759 deps = [ |
| 755 "//third_party/wayland:wayland_util", | 760 "//third_party/wayland:wayland_util", |
| 756 ] | 761 ] |
| 757 | 762 |
| 758 configs -= [ "//build/config/compiler:chromium_code" ] | 763 configs -= [ "//build/config/compiler:chromium_code" ] |
| 759 configs += [ "//build/config/compiler:no_chromium_code" ] | 764 configs += [ "//build/config/compiler:no_chromium_code" ] |
| 760 | 765 |
| 761 public_configs = [ ":wayland_drm_protocol_config" ] | 766 public_configs = [ ":wayland_drm_protocol_config" ] |
| 762 } | 767 } |
| 763 } | 768 } |
| OLD | NEW |