Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(74)

Side by Side Diff: gyp/common_conditions.gypi

Issue 23038014: Add skia_clang_build gyp define, add -Wstring-conversion flag (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | gyp/common_variables.gypi » ('j') | gyp/common_variables.gypi » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # conditions used in both common.gypi and skia.gyp in chromium 1 # conditions used in both common.gypi and skia.gyp in chromium
2 # 2 #
3 { 3 {
4 'defines': [ 4 'defines': [
5 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', 5 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)',
6 ], 6 ],
7 'conditions' : [ 7 'conditions' : [
8 [ 'skia_gpu == 1', 8 [ 'skia_gpu == 1',
9 { 9 {
10 'defines': [ 10 'defines': [
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 '-g', 214 '-g',
215 ], 215 ],
216 'defines': [ 'NDEBUG' ], 216 'defines': [ 'NDEBUG' ],
217 }, 217 },
218 }, 218 },
219 'cflags': [ 219 'cflags': [
220 '-Wall', 220 '-Wall',
221 '-Wextra', 221 '-Wextra',
222 # suppressions below here were added for clang 222 # suppressions below here were added for clang
223 '-Wno-unused-parameter', 223 '-Wno-unused-parameter',
224 '-Wno-c++11-extensions' 224 '-Wno-c++11-extensions',
225 ], 225 ],
226 'conditions' : [ 226 'conditions' : [
227 [ 'skia_shared_lib', { 227 [ 'skia_shared_lib', {
228 'cflags': [ 228 'cflags': [
229 '-fPIC', 229 '-fPIC',
230 ], 230 ],
231 'defines': [ 231 'defines': [
232 'SKIA_DLL', 232 'SKIA_DLL',
233 'SKIA_IMPLEMENTATION=1', 233 'SKIA_IMPLEMENTATION=1',
234 ], 234 ],
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 }], 275 }],
276 [ 'skia_asan_build', { 276 [ 'skia_asan_build', {
277 'cflags': [ 277 'cflags': [
278 '-fsanitize=address', 278 '-fsanitize=address',
279 '-fno-omit-frame-pointer', 279 '-fno-omit-frame-pointer',
280 ], 280 ],
281 'ldflags': [ 281 'ldflags': [
282 '-fsanitize=address', 282 '-fsanitize=address',
283 ], 283 ],
284 }], 284 }],
285 [ 'skia_clang_build', {
borenet 2013/08/21 14:00:58 It's kind of unfortunate that we have to place thi
286 'cflags': [
287 '-Wstring-conversion',
djsollen 2013/08/21 14:09:37 This will break our bots if we check it in. Do we
robertphillips 2013/08/21 14:12:51 Do you mean because all the !""'s outside of what
borenet 2013/08/21 14:16:01 This doesn't change the behavior of our bots, sinc
288 ],
289 }],
285 ], 290 ],
286 }, 291 },
287 ], 292 ],
288 293
289 [ 'skia_os == "mac"', 294 [ 'skia_os == "mac"',
290 { 295 {
291 'variables': { 296 'variables': {
292 'mac_sdk%': '<!(python <(DEPTH)/tools/find_mac_sdk.py 10.6)', 297 'mac_sdk%': '<!(python <(DEPTH)/tools/find_mac_sdk.py 10.6)',
293 }, 298 },
294 'defines': [ 299 'defines': [
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
477 'xcode_settings': { 482 'xcode_settings': {
478 'SYMROOT': '<(DEPTH)/xcodebuild', 483 'SYMROOT': '<(DEPTH)/xcodebuild',
479 }, 484 },
480 } 485 }
481 486
482 # Local Variables: 487 # Local Variables:
483 # tab-width:2 488 # tab-width:2
484 # indent-tabs-mode:nil 489 # indent-tabs-mode:nil
485 # End: 490 # End:
486 # vim: set expandtab tabstop=2 shiftwidth=2: 491 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | gyp/common_variables.gypi » ('j') | gyp/common_variables.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698