| 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' : [ |
| 11 ['skia_pic', { | 11 ['skia_pic', { |
| 12 'cflags': [ | 12 'cflags': [ |
| 13 '-fPIC', | 13 '-fPIC', |
| 14 ], | 14 ], |
| 15 'conditions' : [ | 15 'conditions' : [ |
| 16 # FIXME: The reason we don't do this on Android is due to the way | 16 # 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 | 17 # we build the executables/skia_launcher on Android. See |
| 18 # https://codereview.chromium.org/406613003/diff/1/gyp/common_conditions.g
ypi#newcode455 | 18 # https://codereview.chromium.org/406613003/diff/1/gyp/common_conditions.g
ypi#newcode455 |
| 19 ['skia_os != "android"', { | 19 ['skia_os != "android"', { |
| 20 'target_conditions': [ | 20 'target_conditions': [ |
| 21 [ '_type == "executable"', { | 21 [ '_type == "executable"', { |
| 22 'cflags': [ '-fPIE' ], | 22 'cflags': [ '-fPIE' ], |
| 23 'ldflags': [ '-pie' ], | 23 'ldflags': [ '-pie' ], |
| 24 }], | 24 }], |
| 25 ], | 25 ], |
| 26 }], | 26 }], |
| 27 ], | 27 ], |
| 28 }], | 28 }], |
| 29 [ 'skia_arch_type == "arm64"', { | |
| 30 'cflags': [ | |
| 31 '-ffp-contract=off', | |
| 32 ], | |
| 33 }], | |
| 34 | 29 |
| 35 # As of M35, Chrome requires SSE2 on x86 (and SSSE3 on Mac). | 30 # As of M35, Chrome requires SSE2 on x86 (and SSSE3 on Mac). |
| 36 [ 'skia_arch_type == "x86"', { | 31 [ 'skia_arch_type == "x86"', { |
| 37 'cflags': [ | 32 'cflags': [ |
| 38 '-msse2', | 33 '-msse2', |
| 39 '-mfpmath=sse', | 34 '-mfpmath=sse', |
| 40 ], | 35 ], |
| 41 }], | 36 }], |
| 42 | 37 |
| 43 [ 'skia_os == "win"', | 38 [ 'skia_os == "win"', |
| (...skipping 590 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 634 [ 'skia_is_bot', { | 629 [ 'skia_is_bot', { |
| 635 'defines': [ 'SK_CRASH_HANDLER' ], | 630 'defines': [ 'SK_CRASH_HANDLER' ], |
| 636 }], | 631 }], |
| 637 | 632 |
| 638 ], # end 'conditions' | 633 ], # end 'conditions' |
| 639 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details | 634 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details |
| 640 'xcode_settings': { | 635 'xcode_settings': { |
| 641 'SYMROOT': '<(DEPTH)/xcodebuild', | 636 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 642 }, | 637 }, |
| 643 } | 638 } |
| OLD | NEW |