| 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 429 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 440 # Enable asan, tsan, etc. | 440 # Enable asan, tsan, etc. |
| 441 [ 'skia_sanitizer', { | 441 [ 'skia_sanitizer', { |
| 442 'cflags': [ | 442 'cflags': [ |
| 443 '-fsanitize=<(skia_sanitizer)', | 443 '-fsanitize=<(skia_sanitizer)', |
| 444 ], | 444 ], |
| 445 'ldflags': [ | 445 'ldflags': [ |
| 446 '-fsanitize=<(skia_sanitizer)', | 446 '-fsanitize=<(skia_sanitizer)', |
| 447 ], | 447 ], |
| 448 'conditions' : [ | 448 'conditions' : [ |
| 449 [ 'skia_sanitizer == "thread"', { | 449 [ 'skia_sanitizer == "thread"', { |
| 450 'defines': [ 'DYNAMIC_ANNOTATIONS_ENABLED=1' ], | 450 'defines': [ 'SK_DYNAMIC_ANNOTATIONS_ENABLED=1' ], |
| 451 'cflags': [ '-fPIC' ], | 451 'cflags': [ '-fPIC' ], |
| 452 'target_conditions': [ | 452 'target_conditions': [ |
| 453 [ '_type == "executable"', { | 453 [ '_type == "executable"', { |
| 454 'cflags': [ '-fPIE' ], | 454 'cflags': [ '-fPIE' ], |
| 455 'ldflags': [ '-pie' ], | 455 'ldflags': [ '-pie' ], |
| 456 }], | 456 }], |
| 457 ], | 457 ], |
| 458 }], | 458 }], |
| 459 [ 'skia_sanitizer == "undefined"', { | 459 [ 'skia_sanitizer == "undefined"', { |
| 460 'cflags': [ '-fPIC' ], | 460 'cflags': [ '-fPIC' ], |
| (...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 691 # add flags here (e.g. SK_SUPPORT_LEGACY_...) needed by moz2d | 691 # add flags here (e.g. SK_SUPPORT_LEGACY_...) needed by moz2d |
| 692 ], | 692 ], |
| 693 }], | 693 }], |
| 694 | 694 |
| 695 ], # end 'conditions' | 695 ], # end 'conditions' |
| 696 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details | 696 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details |
| 697 'xcode_settings': { | 697 'xcode_settings': { |
| 698 'SYMROOT': '<(DEPTH)/xcodebuild', | 698 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 699 }, | 699 }, |
| 700 } | 700 } |
| OLD | NEW |