| 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 621 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 632 }], | 632 }], |
| 633 | 633 |
| 634 [ 'skia_moz2d', { | 634 [ 'skia_moz2d', { |
| 635 'defines': [ | 635 'defines': [ |
| 636 'SK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1', | 636 'SK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1', |
| 637 'SK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1', | 637 'SK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1', |
| 638 'SK_SUPPORT_LEGACY_GETTOTALCLIP=1', | 638 'SK_SUPPORT_LEGACY_GETTOTALCLIP=1', |
| 639 ], | 639 ], |
| 640 }], | 640 }], |
| 641 | 641 |
| 642 [ 'skia_build_json_writer', { |
| 643 'defines': [ |
| 644 'SK_BUILD_JSON_WRITER', |
| 645 ] |
| 646 }], |
| 647 |
| 642 ], # end 'conditions' | 648 ], # end 'conditions' |
| 643 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details | 649 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details |
| 644 'xcode_settings': { | 650 'xcode_settings': { |
| 645 'SYMROOT': '<(DEPTH)/xcodebuild', | 651 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 646 }, | 652 }, |
| 647 } | 653 } |
| OLD | NEW |