| 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 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 203 [ 'skia_arch_width == 32', { | 203 [ 'skia_arch_width == 32', { |
| 204 'cflags': [ | 204 'cflags': [ |
| 205 '-m32', | 205 '-m32', |
| 206 ], | 206 ], |
| 207 'ldflags': [ | 207 'ldflags': [ |
| 208 '-m32', | 208 '-m32', |
| 209 ], | 209 ], |
| 210 }], | 210 }], |
| 211 ], | 211 ], |
| 212 }], | 212 }], |
| 213 [ 'skia_asan_build', { |
| 214 'cflags': [ |
| 215 '-fsanitize=address', |
| 216 '-fno-omit-frame-pointer', |
| 217 ], |
| 218 'ldflags': [ |
| 219 '-fsanitize=address', |
| 220 ], |
| 221 }], |
| 213 ], | 222 ], |
| 214 }, | 223 }, |
| 215 ], | 224 ], |
| 216 | 225 |
| 217 [ 'skia_os == "mac"', | 226 [ 'skia_os == "mac"', |
| 218 { | 227 { |
| 219 'variables': { | 228 'variables': { |
| 220 'mac_sdk%': '<!(python <(DEPTH)/tools/find_mac_sdk.py 10.6)', | 229 'mac_sdk%': '<!(python <(DEPTH)/tools/find_mac_sdk.py 10.6)', |
| 221 }, | 230 }, |
| 222 'defines': [ | 231 'defines': [ |
| (...skipping 10 matching lines...) Expand all Loading... |
| 233 'ARCHS': ['i386'], | 242 'ARCHS': ['i386'], |
| 234 }, | 243 }, |
| 235 }], | 244 }], |
| 236 [ 'skia_warnings_as_errors', { | 245 [ 'skia_warnings_as_errors', { |
| 237 'xcode_settings': { | 246 'xcode_settings': { |
| 238 'OTHER_CPLUSPLUSFLAGS': [ | 247 'OTHER_CPLUSPLUSFLAGS': [ |
| 239 '-Werror', | 248 '-Werror', |
| 240 ], | 249 ], |
| 241 }, | 250 }, |
| 242 }], | 251 }], |
| 252 [ 'skia_asan_build', { |
| 253 'cflags': [ |
| 254 '-fsanitize=address', |
| 255 '-fno-omit-frame-pointer', |
| 256 ], |
| 257 'ldflags': [ |
| 258 '-fsanitize=address', |
| 259 ], |
| 260 }], |
| 243 ], | 261 ], |
| 244 'configurations': { | 262 'configurations': { |
| 245 'Debug': { | 263 'Debug': { |
| 246 'xcode_settings': { | 264 'xcode_settings': { |
| 247 'GCC_OPTIMIZATION_LEVEL': '0', | 265 'GCC_OPTIMIZATION_LEVEL': '0', |
| 248 }, | 266 }, |
| 249 }, | 267 }, |
| 250 'Release': { | 268 'Release': { |
| 251 'xcode_settings': { | 269 'xcode_settings': { |
| 252 'GCC_OPTIMIZATION_LEVEL': '<(skia_release_optimization_level)', | 270 'GCC_OPTIMIZATION_LEVEL': '<(skia_release_optimization_level)', |
| (...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 436 'xcode_settings': { | 454 'xcode_settings': { |
| 437 'SYMROOT': '<(DEPTH)/xcodebuild', | 455 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 438 }, | 456 }, |
| 439 } | 457 } |
| 440 | 458 |
| 441 # Local Variables: | 459 # Local Variables: |
| 442 # tab-width:2 | 460 # tab-width:2 |
| 443 # indent-tabs-mode:nil | 461 # indent-tabs-mode:nil |
| 444 # End: | 462 # End: |
| 445 # vim: set expandtab tabstop=2 shiftwidth=2: | 463 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |
|---|
Chromium Code Reviews
