| 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 674 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 685 'SK_USE_POSIX_THREADS', | 685 'SK_USE_POSIX_THREADS', |
| 686 ], | 686 ], |
| 687 }], | 687 }], |
| 688 | 688 |
| 689 [ 'skia_moz2d', { | 689 [ 'skia_moz2d', { |
| 690 'defines': [ | 690 'defines': [ |
| 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 [ 'skia_crash_handler', { | |
| 696 'defines': [ 'SK_CRASH_HANDLER' ], | |
| 697 }], | |
| 698 | |
| 699 ], # end 'conditions' | 695 ], # end 'conditions' |
| 700 # 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 |
| 701 'xcode_settings': { | 697 'xcode_settings': { |
| 702 'SYMROOT': '<(DEPTH)/xcodebuild', | 698 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 703 }, | 699 }, |
| 704 } | 700 } |
| OLD | NEW |