| 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 661 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 672 }], | 672 }], |
| 673 | 673 |
| 674 [ 'skia_moz2d', { | 674 [ 'skia_moz2d', { |
| 675 'defines': [ | 675 'defines': [ |
| 676 'SK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1', | 676 'SK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1', |
| 677 'SK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1', | 677 'SK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1', |
| 678 'SK_SUPPORT_LEGACY_GETTOTALCLIP=1', | 678 'SK_SUPPORT_LEGACY_GETTOTALCLIP=1', |
| 679 ], | 679 ], |
| 680 }], | 680 }], |
| 681 | 681 |
| 682 [ 'skia_build_json_writer', { | |
| 683 'defines': [ | |
| 684 'SK_BUILD_JSON_WRITER', | |
| 685 ] | |
| 686 }], | |
| 687 | |
| 688 ], # end 'conditions' | 682 ], # end 'conditions' |
| 689 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details | 683 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details |
| 690 'xcode_settings': { | 684 'xcode_settings': { |
| 691 'SYMROOT': '<(DEPTH)/xcodebuild', | 685 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 692 }, | 686 }, |
| 693 } | 687 } |
| OLD | NEW |