| 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_HINTING_SCALE_FACTOR', | 6 # 'SK_SUPPORT_HINTING_SCALE_FACTOR', |
| 7 ], | 7 ], |
| 8 'conditions' : [ | 8 'conditions' : [ |
| 9 [ 'skia_gpu == 1', | 9 [ 'skia_gpu == 1', |
| 10 { | 10 { |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 143 }], | 143 }], |
| 144 [ 'skia_arch_type == "arm" and armv7 == 1', { | 144 [ 'skia_arch_type == "arm" and armv7 == 1', { |
| 145 'variables': { | 145 'variables': { |
| 146 'arm_neon_optional%': 0, | 146 'arm_neon_optional%': 0, |
| 147 }, | 147 }, |
| 148 'defines': [ | 148 'defines': [ |
| 149 '__ARM_ARCH__=7', | 149 '__ARM_ARCH__=7', |
| 150 ], | 150 ], |
| 151 'cflags': [ | 151 'cflags': [ |
| 152 '-march=armv7-a', | 152 '-march=armv7-a', |
| 153 '-mfloat-abi=softfp', | |
| 154 ], | 153 ], |
| 155 'conditions': [ | 154 'conditions': [ |
| 156 [ 'arm_neon == 1', { | 155 [ 'arm_neon == 1', { |
| 157 'defines': [ | 156 'defines': [ |
| 158 '__ARM_HAVE_NEON', | 157 '__ARM_HAVE_NEON', |
| 159 ], | 158 ], |
| 160 'cflags': [ | 159 'cflags': [ |
| 161 '-mfpu=neon', | 160 '-mfpu=neon', |
| 162 ], | 161 ], |
| 163 'ldflags': [ | 162 'ldflags': [ |
| 164 '-march=armv7-a', | 163 '-march=armv7-a', |
| 165 '-Wl,--fix-cortex-a8', | 164 '-Wl,--fix-cortex-a8', |
| 166 ], | 165 ], |
| 167 }], | 166 }], |
| 168 [ 'arm_neon_optional == 1', { | 167 [ 'arm_neon_optional == 1', { |
| 169 'defines': [ | 168 'defines': [ |
| 170 '__ARM_HAVE_OPTIONAL_NEON_SUPPORT', | 169 '__ARM_HAVE_OPTIONAL_NEON_SUPPORT', |
| 171 ], | 170 ], |
| 172 }], | 171 }], |
| 172 [ 'skia_os != "chromeos"', { |
| 173 'cflags': [ |
| 174 '-mfloat-abi=softfp', |
| 175 ], |
| 176 }], |
| 173 ], | 177 ], |
| 174 }], | 178 }], |
| 175 ], | 179 ], |
| 176 }, | 180 }, |
| 177 ], | 181 ], |
| 178 | 182 |
| 179 | 183 |
| 180 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"]
', | 184 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"]
', |
| 181 { | 185 { |
| 182 'defines': [ | 186 'defines': [ |
| (...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 450 'xcode_settings': { | 454 'xcode_settings': { |
| 451 'SYMROOT': '<(DEPTH)/xcodebuild', | 455 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 452 }, | 456 }, |
| 453 } | 457 } |
| 454 | 458 |
| 455 # Local Variables: | 459 # Local Variables: |
| 456 # tab-width:2 | 460 # tab-width:2 |
| 457 # indent-tabs-mode:nil | 461 # indent-tabs-mode:nil |
| 458 # End: | 462 # End: |
| 459 # vim: set expandtab tabstop=2 shiftwidth=2: | 463 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |