| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 'generated_src_dir': 'src/chromium_gensrc', | 7 'generated_src_dir': 'src/chromium_gensrc', |
| 8 }, | 8 }, |
| 9 'target_defaults': { | 9 'target_defaults': { |
| 10 'defines': [ | 10 'defines': [ |
| (...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 264 '<(generated_src_dir)/mesa/glapi', | 264 '<(generated_src_dir)/mesa/glapi', |
| 265 ], | 265 ], |
| 266 'dependencies': [ | 266 'dependencies': [ |
| 267 'mesa_headers', | 267 'mesa_headers', |
| 268 'mesa_libglslcommon', | 268 'mesa_libglslcommon', |
| 269 ], | 269 ], |
| 270 # TODO(scottmg): http://crbug.com/143877 These should be removed if | 270 # TODO(scottmg): http://crbug.com/143877 These should be removed if |
| 271 # Mesa is ever rolled and the warnings are fixed. | 271 # Mesa is ever rolled and the warnings are fixed. |
| 272 'msvs_disabled_warnings': [ | 272 'msvs_disabled_warnings': [ |
| 273 4005, 4018, 4090, 4099, 4146, 4291, 4305, 4334, 4748, 4267, | 273 4005, 4018, 4090, 4099, 4146, 4291, 4305, 4334, 4748, 4267, |
| 274 # TODO(brucedawson): http://crbug.com/554200 4311 is a VS |
| 275 # 2015 64-bit warning for pointer truncation |
| 276 4311, |
| 274 ], | 277 ], |
| 275 'variables': { | 278 'variables': { |
| 276 'clang_warning_flags': [ | 279 'clang_warning_flags': [ |
| 277 '-Wno-tautological-constant-out-of-range-compare', | 280 '-Wno-tautological-constant-out-of-range-compare', |
| 278 '-Wno-absolute-value', # Fires on st_atom_array.c, might be a bug | 281 '-Wno-absolute-value', # Fires on st_atom_array.c, might be a bug |
| 279 '-Wno-mismatched-tags', # Fixed upstream. | 282 '-Wno-mismatched-tags', # Fixed upstream. |
| 280 # mesa's STATIC_ASSERT() macro expands to an ununused typedef. | 283 # mesa's STATIC_ASSERT() macro expands to an ununused typedef. |
| 281 '-Wno-unused-local-typedef', | 284 '-Wno-unused-local-typedef', |
| 282 ], | 285 ], |
| 283 'clang_warning_flags_unset': [ | 286 'clang_warning_flags_unset': [ |
| (...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 781 'direct_dependent_settings': { | 784 'direct_dependent_settings': { |
| 782 'include_dirs': [ | 785 'include_dirs': [ |
| 783 '<(generated_src_dir)/egl/wayland/wayland-drm', | 786 '<(generated_src_dir)/egl/wayland/wayland-drm', |
| 784 ], | 787 ], |
| 785 }, | 788 }, |
| 786 }, | 789 }, |
| 787 ], | 790 ], |
| 788 }], | 791 }], |
| 789 ], | 792 ], |
| 790 } | 793 } |
| OLD | NEW |