| 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 262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 273 'ldflags': [ | 273 'ldflags': [ |
| 274 '-m32', | 274 '-m32', |
| 275 ], | 275 ], |
| 276 }], | 276 }], |
| 277 ], | 277 ], |
| 278 }], | 278 }], |
| 279 # Enable asan, tsan, etc. | 279 # Enable asan, tsan, etc. |
| 280 [ 'skia_sanitizer', { | 280 [ 'skia_sanitizer', { |
| 281 'cflags': [ | 281 'cflags': [ |
| 282 '-fsanitize=<(skia_sanitizer)', | 282 '-fsanitize=<(skia_sanitizer)', |
| 283 '-fno-omit-frame-pointer', | |
| 284 ], | 283 ], |
| 285 'ldflags': [ | 284 'ldflags': [ |
| 286 '-fsanitize=<(skia_sanitizer)', | 285 '-fsanitize=<(skia_sanitizer)', |
| 287 ], | 286 ], |
| 288 'conditions' : [ | 287 'conditions' : [ |
| 289 [ 'skia_sanitizer == "thread"', { | 288 [ 'skia_sanitizer == "thread"', { |
| 290 'defines': [ 'DYNAMIC_ANNOTATIONS_ENABLED=1' ], | 289 'defines': [ 'DYNAMIC_ANNOTATIONS_ENABLED=1' ], |
| 291 'cflags': [ '-fPIC' ], | 290 'cflags': [ '-fPIC' ], |
| 292 'target_conditions': [ | 291 'target_conditions': [ |
| 293 [ '_type == "executable"', { | 292 [ '_type == "executable"', { |
| 294 'cflags': [ '-fPIE' ], | 293 'cflags': [ '-fPIE' ], |
| 295 'ldflags': [ '-pie' ], | 294 'ldflags': [ '-pie' ], |
| 296 }], | 295 }], |
| 297 ], | 296 ], |
| 298 }], | 297 }], |
| 299 ], | 298 ], |
| 300 }], | 299 }], |
| 301 [ 'skia_clang_build', { | 300 [ 'skia_clang_build', { |
| 302 'cflags': [ | 301 'cflags': [ |
| 303 # Extra warnings we like but that only Clang knows about. | 302 # Extra warnings we like but that only Clang knows about. |
| 304 '-Wstring-conversion', | 303 '-Wstring-conversion', |
| 305 ], | 304 ], |
| 306 }], | 305 }], |
| 306 [ 'skia_keep_frame_pointer', { |
| 307 'cflags': [ '-fno-omit-frame-pointer' ], |
| 308 }], |
| 307 ], | 309 ], |
| 308 }, | 310 }, |
| 309 ], | 311 ], |
| 310 | 312 |
| 311 [ 'skia_os == "mac"', | 313 [ 'skia_os == "mac"', |
| 312 { | 314 { |
| 313 'variables': { | 315 'variables': { |
| 314 'mac_sdk%': '<!(python <(DEPTH)/tools/find_mac_sdk.py 10.6)', | 316 'mac_sdk%': '<!(python <(DEPTH)/tools/find_mac_sdk.py 10.6)', |
| 315 }, | 317 }, |
| 316 'defines': [ | 318 'defines': [ |
| (...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 499 'xcode_settings': { | 501 'xcode_settings': { |
| 500 'SYMROOT': '<(DEPTH)/xcodebuild', | 502 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 501 }, | 503 }, |
| 502 } | 504 } |
| 503 | 505 |
| 504 # Local Variables: | 506 # Local Variables: |
| 505 # tab-width:2 | 507 # tab-width:2 |
| 506 # indent-tabs-mode:nil | 508 # indent-tabs-mode:nil |
| 507 # End: | 509 # End: |
| 508 # vim: set expandtab tabstop=2 shiftwidth=2: | 510 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |