| 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 'SK_PICTURE_USE_SK_RECORD', |
| 9 ], | 10 ], |
| 10 'conditions' : [ | 11 'conditions' : [ |
| 11 ['skia_pic', { | 12 ['skia_pic', { |
| 12 'cflags': [ | 13 'cflags': [ |
| 13 '-fPIC', | 14 '-fPIC', |
| 14 ], | 15 ], |
| 15 'conditions' : [ | 16 'conditions' : [ |
| 16 # FIXME: The reason we don't do this on Android is due to the way | 17 # FIXME: The reason we don't do this on Android is due to the way |
| 17 # we build the executables/skia_launcher on Android. See | 18 # we build the executables/skia_launcher on Android. See |
| 18 # https://codereview.chromium.org/406613003/diff/1/gyp/common_conditions.g
ypi#newcode455 | 19 # https://codereview.chromium.org/406613003/diff/1/gyp/common_conditions.g
ypi#newcode455 |
| (...skipping 610 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 629 [ 'skia_is_bot', { | 630 [ 'skia_is_bot', { |
| 630 'defines': [ 'SK_CRASH_HANDLER' ], | 631 'defines': [ 'SK_CRASH_HANDLER' ], |
| 631 }], | 632 }], |
| 632 | 633 |
| 633 ], # end 'conditions' | 634 ], # end 'conditions' |
| 634 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details | 635 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details |
| 635 'xcode_settings': { | 636 'xcode_settings': { |
| 636 'SYMROOT': '<(DEPTH)/xcodebuild', | 637 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 637 }, | 638 }, |
| 638 } | 639 } |
| OLD | NEW |