OLD | NEW |
---|---|
1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 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 # This gypi file handles the removal of platform-specific files from the | 5 # This gypi file handles the removal of platform-specific files from the |
6 # Skia build. | 6 # Skia build. |
7 { | 7 { |
8 'includes': [ | 8 'includes': [ |
9 # skia_for_chromium_defines.gypi defines skia_for_chromium_defines | 9 # skia_for_chromium_defines.gypi defines skia_for_chromium_defines |
10 '../third_party/skia/gyp/skia_for_chromium_defines.gypi', | 10 '../third_party/skia/gyp/skia_for_chromium_defines.gypi', |
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
130 'skia_support_gpu': 0, | 130 'skia_support_gpu': 0, |
131 }, { | 131 }, { |
132 'skia_support_gpu': 1, | 132 'skia_support_gpu': 1, |
133 }], | 133 }], |
134 ['OS=="ios" or enable_printing == 0', { | 134 ['OS=="ios" or enable_printing == 0', { |
135 'skia_support_pdf': 0, | 135 'skia_support_pdf': 0, |
136 }, { | 136 }, { |
137 'skia_support_pdf': 1, | 137 'skia_support_pdf': 1, |
138 }], | 138 }], |
139 ], | 139 ], |
140 # TODO(scottmg): http://crbug.com/177306 | |
141 'clang_warning_flags': [ | |
142 # Don't warn about string->bool used in asserts. | |
143 '-Wstring-conversion', | |
hans
2014/08/14 21:11:02
I just noticed this: it looks like this is adding
Nico
2014/08/14 21:15:35
That looks wrong, it should've probably been clang
scottmg
2014/08/14 21:18:10
Looks like they're mostly gone https://code.google
| |
144 ] | |
140 }, | 145 }, |
141 'skia_support_gpu': '<(skia_support_gpu)', | 146 'skia_support_gpu': '<(skia_support_gpu)', |
142 'skia_support_pdf': '<(skia_support_pdf)', | 147 'skia_support_pdf': '<(skia_support_pdf)', |
143 | 148 |
144 # These two set the paths so we can include skia/gyp/core.gypi | 149 # These two set the paths so we can include skia/gyp/core.gypi |
145 'skia_src_path': '../third_party/skia/src', | 150 'skia_src_path': '../third_party/skia/src', |
146 'skia_include_path': '../third_party/skia/include', | 151 'skia_include_path': '../third_party/skia/include', |
147 | 152 |
148 # This list will contain all defines that also need to be exported to | 153 # This list will contain all defines that also need to be exported to |
149 # dependent components. | 154 # dependent components. |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
212 # re-export if they include Skia headers in their public headers. | 217 # re-export if they include Skia headers in their public headers. |
213 'all_dependent_settings': { | 218 'all_dependent_settings': { |
214 'include_dirs': [ | 219 'include_dirs': [ |
215 '..', | 220 '..', |
216 'config', | 221 'config', |
217 ], | 222 ], |
218 }, | 223 }, |
219 | 224 |
220 'msvs_disabled_warnings': [4244, 4267, 4341, 4345, 4390, 4554, 4748, 4800], | 225 'msvs_disabled_warnings': [4244, 4267, 4341, 4345, 4390, 4554, 4748, 4800], |
221 } | 226 } |
OLD | NEW |