| 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 107 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 118 # mesa_internal_config is prepended to the config lists.  Flags that | 118 # mesa_internal_config is prepended to the config lists.  Flags that | 
| 119 # disable warnings need to be appended instead so that they show up | 119 # disable warnings need to be appended instead so that they show up | 
| 120 # after flags like -Wall. (gn orders flags on a target before flags from | 120 # after flags like -Wall. (gn orders flags on a target before flags from | 
| 121 # configs.) | 121 # configs.) | 
| 122 config("mesa_internal_warnings") { | 122 config("mesa_internal_warnings") { | 
| 123   cflags = [] | 123   cflags = [] | 
| 124   if (is_clang) { | 124   if (is_clang) { | 
| 125     cflags += [ | 125     cflags += [ | 
| 126       "-Wno-tautological-constant-out-of-range-compare", | 126       "-Wno-tautological-constant-out-of-range-compare", | 
| 127       "-Wno-mismatched-tags",  # Fixed upstream. | 127       "-Wno-mismatched-tags",  # Fixed upstream. | 
|  | 128 | 
| 128       # mesa's STATIC_ASSERT() macro expands to an ununused typedef. | 129       # mesa's STATIC_ASSERT() macro expands to an ununused typedef. | 
| 129       "-Wno-unused-local-typedef", | 130       "-Wno-unused-local-typedef", | 
| 130     ] | 131     ] | 
| 131   } | 132   } | 
| 132   if (is_win) { | 133   if (is_win) { | 
| 133     # TODO(scottmg): http://crbug.com/143877 These should be removed if | 134     # TODO(scottmg): http://crbug.com/143877 These should be removed if | 
| 134     # Mesa is ever rolled and the warnings are fixed. | 135     # Mesa is ever rolled and the warnings are fixed. | 
| 135     cflags += [ | 136     cflags += [ | 
| 136       "/wd4005",  # Macro defined twice. | 137       "/wd4005",  # Macro defined twice. | 
|  | 138       "/wd4018",  # Signed/unsigned mismatch in comparison. | 
| 137       "/wd4065",  # Switch statement contains 'default' but no 'case' labels. | 139       "/wd4065",  # Switch statement contains 'default' but no 'case' labels. | 
| 138       "/wd4090",  # 'Operation' : different 'modifier' qualifiers | 140       "/wd4090",  # 'Operation' : different 'modifier' qualifiers | 
| 139       "/wd4099",  # Type name struct-vs-class doesn't match. | 141       "/wd4099",  # Type name struct-vs-class doesn't match. | 
| 140       "/wd4273",  # Inconsistent DLL linkage. | 142       "/wd4273",  # Inconsistent DLL linkage. | 
| 141       "/wd4291",  # No matching operator delete found for placement new. | 143       "/wd4291",  # No matching operator delete found for placement new. | 
| 142       "/wd4305",  # Truncation from int to float. | 144       "/wd4305",  # Truncation from int to float. | 
| 143       "/wd4334",  # Result of 32-bit shift implicitly converted to 64 bits. | 145       "/wd4334",  # Result of 32-bit shift implicitly converted to 64 bits. | 
| 144       "/wd4345",  # POD-type default initializers. | 146       "/wd4345",  # POD-type default initializers. | 
| 145     ] | 147     ] | 
| 146   } | 148   } | 
| (...skipping 569 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 716         "KEYWORD2=GLAPIENTRY", | 718         "KEYWORD2=GLAPIENTRY", | 
| 717       ] | 719       ] | 
| 718     } | 720     } | 
| 719   } | 721   } | 
| 720 } else { | 722 } else { | 
| 721   #  Placeholder to allow targets to unconditionally depend on this. | 723   #  Placeholder to allow targets to unconditionally depend on this. | 
| 722   group("osmesa") { | 724   group("osmesa") { | 
| 723   } | 725   } | 
| 724 }  # !is_android | 726 }  # !is_android | 
| 725 # TODO(GYP) Android osmesa_in_lib_dir target. | 727 # TODO(GYP) Android osmesa_in_lib_dir target. | 
| OLD | NEW | 
|---|