| 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 605 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 616 ], | 616 ], |
| 617 'GCC_THUMB_SUPPORT': 'NO', | 617 'GCC_THUMB_SUPPORT': 'NO', |
| 618 }, | 618 }, |
| 619 }, | 619 }, |
| 620 ], | 620 ], |
| 621 | 621 |
| 622 [ 'skia_os == "android"', | 622 [ 'skia_os == "android"', |
| 623 { | 623 { |
| 624 'defines': [ | 624 'defines': [ |
| 625 'SK_BUILD_FOR_ANDROID', | 625 'SK_BUILD_FOR_ANDROID', |
| 626 'SK_FONTHOST_DOES_NOT_USE_FONTMGR', | 626 # 'SK_FONTHOST_DOES_NOT_USE_FONTMGR', |
| 627 | 627 |
| 628 # Android Text Tuning | 628 # Android Text Tuning |
| 629 'SK_GAMMA_EXPONENT=1.4', | 629 'SK_GAMMA_EXPONENT=1.4', |
| 630 'SK_GAMMA_CONTRAST=0.0', | 630 'SK_GAMMA_CONTRAST=0.0', |
| 631 ], | 631 ], |
| 632 # Android defines a fixed gamma exponent instead of using SRGB | 632 # Android defines a fixed gamma exponent instead of using SRGB |
| 633 'defines!': [ | 633 'defines!': [ |
| 634 'SK_GAMMA_SRGB', | 634 'SK_GAMMA_SRGB', |
| 635 ], | 635 ], |
| 636 'configurations': { | 636 'configurations': { |
| (...skipping 54 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 |