| OLD | NEW |
| 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 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 279 }], | 279 }], |
| 280 # Enable asan, tsan, etc. | 280 # Enable asan, tsan, etc. |
| 281 [ 'skia_sanitizer', { | 281 [ 'skia_sanitizer', { |
| 282 'cflags': [ | 282 'cflags': [ |
| 283 '-fsanitize=<(skia_sanitizer)', | 283 '-fsanitize=<(skia_sanitizer)', |
| 284 '-fno-omit-frame-pointer', | 284 '-fno-omit-frame-pointer', |
| 285 ], | 285 ], |
| 286 'ldflags': [ | 286 'ldflags': [ |
| 287 '-fsanitize=<(skia_sanitizer)', | 287 '-fsanitize=<(skia_sanitizer)', |
| 288 ], | 288 ], |
| 289 'conditions' : [ |
| 290 [ 'skia_sanitizer == "thread"', { |
| 291 'defines': [ 'DYNAMIC_ANNOTATIONS_ENABLED=1' ], |
| 292 }], |
| 293 ], |
| 289 }], | 294 }], |
| 290 [ 'skia_clang_build', { | 295 [ 'skia_clang_build', { |
| 291 'cflags': [ | 296 'cflags': [ |
| 292 # Extra warnings we like but that only Clang knows about. | 297 # Extra warnings we like but that only Clang knows about. |
| 293 '-Wstring-conversion', | 298 '-Wstring-conversion', |
| 294 ], | 299 ], |
| 295 }], | 300 }], |
| 296 ], | 301 ], |
| 297 }, | 302 }, |
| 298 ], | 303 ], |
| (...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 488 'xcode_settings': { | 493 'xcode_settings': { |
| 489 'SYMROOT': '<(DEPTH)/xcodebuild', | 494 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 490 }, | 495 }, |
| 491 } | 496 } |
| 492 | 497 |
| 493 # Local Variables: | 498 # Local Variables: |
| 494 # tab-width:2 | 499 # tab-width:2 |
| 495 # indent-tabs-mode:nil | 500 # indent-tabs-mode:nil |
| 496 # End: | 501 # End: |
| 497 # vim: set expandtab tabstop=2 shiftwidth=2: | 502 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |