| 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 'SK_SUPPORT_GPU=<(skia_gpu)', | 6 'SK_SUPPORT_GPU=<(skia_gpu)', |
| 7 'SK_SUPPORT_OPENCL=<(skia_opencl)', | 7 'SK_SUPPORT_OPENCL=<(skia_opencl)', |
| 8 'SK_FORCE_DISTANCEFIELD_FONTS=<(skia_force_distancefield_fonts)', | 8 'SK_FORCE_DISTANCEFIELD_FONTS=<(skia_force_distancefield_fonts)', |
| 9 ], | 9 ], |
| 10 'conditions' : [ | 10 'conditions' : [ |
| (...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 404 [ 'skia_sanitizer == "thread"', { | 404 [ 'skia_sanitizer == "thread"', { |
| 405 'defines': [ 'DYNAMIC_ANNOTATIONS_ENABLED=1' ], | 405 'defines': [ 'DYNAMIC_ANNOTATIONS_ENABLED=1' ], |
| 406 'cflags': [ '-fPIC' ], | 406 'cflags': [ '-fPIC' ], |
| 407 'target_conditions': [ | 407 'target_conditions': [ |
| 408 [ '_type == "executable"', { | 408 [ '_type == "executable"', { |
| 409 'cflags': [ '-fPIE' ], | 409 'cflags': [ '-fPIE' ], |
| 410 'ldflags': [ '-pie' ], | 410 'ldflags': [ '-pie' ], |
| 411 }], | 411 }], |
| 412 ], | 412 ], |
| 413 }], | 413 }], |
| 414 [ 'skia_sanitizer == "undefined"', { |
| 415 'cflags': [ '-fPIC' ], |
| 416 'cflags_cc!': ['-fno-rtti'], |
| 417 'target_conditions': [ |
| 418 [ '_type == "executable"', { |
| 419 'cflags': [ '-fPIE' ], |
| 420 'ldflags': [ '-pie' ], |
| 421 }], |
| 422 ], |
| 423 }], |
| 414 ], | 424 ], |
| 415 }], | 425 }], |
| 416 [ 'skia_clang_build', { | 426 [ 'skia_clang_build', { |
| 417 'cflags': [ | 427 'cflags': [ |
| 418 # Extra warnings we like but that only Clang knows about. | 428 # Extra warnings we like but that only Clang knows about. |
| 419 '-Wstring-conversion', | 429 '-Wstring-conversion', |
| 420 ], | 430 ], |
| 421 }], | 431 }], |
| 422 [ 'skia_keep_frame_pointer', { | 432 [ 'skia_keep_frame_pointer', { |
| 423 'cflags': [ '-fno-omit-frame-pointer' ], | 433 'cflags': [ '-fno-omit-frame-pointer' ], |
| (...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 619 'defines': [ | 629 'defines': [ |
| 620 'SK_USE_POSIX_THREADS', | 630 'SK_USE_POSIX_THREADS', |
| 621 ], | 631 ], |
| 622 }], | 632 }], |
| 623 ], # end 'conditions' | 633 ], # end 'conditions' |
| 624 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details | 634 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details |
| 625 'xcode_settings': { | 635 'xcode_settings': { |
| 626 'SYMROOT': '<(DEPTH)/xcodebuild', | 636 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 627 }, | 637 }, |
| 628 } | 638 } |
| OLD | NEW |