| 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 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 268 # TODO(scottmg): http://crbug.com/143877 These should be removed if | 268 # TODO(scottmg): http://crbug.com/143877 These should be removed if |
| 269 # Mesa is ever rolled and the warnings are fixed. | 269 # Mesa is ever rolled and the warnings are fixed. |
| 270 'msvs_disabled_warnings': [ | 270 'msvs_disabled_warnings': [ |
| 271 4005, 4018, 4090, 4099, 4146, 4291, 4305, 4334, 4748, 4267, | 271 4005, 4018, 4090, 4099, 4146, 4291, 4305, 4334, 4748, 4267, |
| 272 ], | 272 ], |
| 273 'variables': { | 273 'variables': { |
| 274 'clang_warning_flags': [ | 274 'clang_warning_flags': [ |
| 275 '-Wno-tautological-constant-out-of-range-compare', | 275 '-Wno-tautological-constant-out-of-range-compare', |
| 276 '-Wno-absolute-value', # Fires on st_atom_array.c, might be a bug | 276 '-Wno-absolute-value', # Fires on st_atom_array.c, might be a bug |
| 277 '-Wno-mismatched-tags', # Fixed upstream. | 277 '-Wno-mismatched-tags', # Fixed upstream. |
| 278 # mesa's STATIC_ASSERT() macro expands to an ununused typedef. |
| 279 '-Wno-unused-local-typedef', |
| 278 ], | 280 ], |
| 279 'clang_warning_flags_unset': [ | 281 'clang_warning_flags_unset': [ |
| 280 # Don't warn about string->bool used in asserts. | 282 # Don't warn about string->bool used in asserts. |
| 281 '-Wstring-conversion', | 283 '-Wstring-conversion', |
| 282 ], | 284 ], |
| 283 }, | 285 }, |
| 284 'sources': [ | 286 'sources': [ |
| 285 '<(generated_src_dir)/mesa/builtin_function.cpp', | 287 '<(generated_src_dir)/mesa/builtin_function.cpp', |
| 286 '<(generated_src_dir)/mesa/glapi_mapi_tmp_shared.h', | 288 '<(generated_src_dir)/mesa/glapi_mapi_tmp_shared.h', |
| 287 'src/src/mapi/mapi/entry.c', | 289 'src/src/mapi/mapi/entry.c', |
| (...skipping 465 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 753 '<(PRODUCT_DIR)/libosmesa.so', | 755 '<(PRODUCT_DIR)/libosmesa.so', |
| 754 '<(SHARED_LIB_DIR)/libosmesa.so', | 756 '<(SHARED_LIB_DIR)/libosmesa.so', |
| 755 ], | 757 ], |
| 756 }, | 758 }, |
| 757 ], | 759 ], |
| 758 }, | 760 }, |
| 759 ], | 761 ], |
| 760 }], | 762 }], |
| 761 ], | 763 ], |
| 762 } | 764 } |
| OLD | NEW |