| 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 301 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 312 'SK_SUPPORT_LEGACY_PICTURE_CAN_RECORD', | 312 'SK_SUPPORT_LEGACY_PICTURE_CAN_RECORD', |
| 313 'SK_SUPPORT_DEPRECATED_RECORD_FLAGS', | 313 'SK_SUPPORT_DEPRECATED_RECORD_FLAGS', |
| 314 'SK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES', | 314 'SK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES', |
| 315 'SK_SUPPORT_LEGACY_PICTURE_HEADERS', | 315 'SK_SUPPORT_LEGACY_PICTURE_HEADERS', |
| 316 'SK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE', | 316 'SK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE', |
| 317 # Needed until we fix skbug.com/2440. | 317 # Needed until we fix skbug.com/2440. |
| 318 'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG', | 318 'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG', |
| 319 # Transitional, for deprecated SkCanvas::SaveFlags methods. | 319 # Transitional, for deprecated SkCanvas::SaveFlags methods. |
| 320 'SK_ATTR_DEPRECATED=SK_NOTHING_ARG1', | 320 'SK_ATTR_DEPRECATED=SK_NOTHING_ARG1', |
| 321 'SK_SUPPORT_LEGACY_SHADER_LOCALMATRIX', | 321 'SK_SUPPORT_LEGACY_SHADER_LOCALMATRIX', |
| 322 'SK_DEFAULT_GLOBAL_DISCARDABLE_MEMORY_POOL_SIZE (512 * 1024)', |
| 322 ], | 323 ], |
| 323 }], | 324 }], |
| 324 | 325 |
| 325 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"]
', | 326 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"]
', |
| 326 { | 327 { |
| 327 'defines': [ | 328 'defines': [ |
| 328 'SK_SAMPLES_FOR_X', | 329 'SK_SAMPLES_FOR_X', |
| 329 'SK_BUILD_FOR_UNIX', | 330 'SK_BUILD_FOR_UNIX', |
| 330 ], | 331 ], |
| 331 'configurations': { | 332 'configurations': { |
| (...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 654 'SK_BUILD_JSON_WRITER', | 655 'SK_BUILD_JSON_WRITER', |
| 655 ] | 656 ] |
| 656 }], | 657 }], |
| 657 | 658 |
| 658 ], # end 'conditions' | 659 ], # end 'conditions' |
| 659 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details | 660 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details |
| 660 'xcode_settings': { | 661 'xcode_settings': { |
| 661 'SYMROOT': '<(DEPTH)/xcodebuild', | 662 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 662 }, | 663 }, |
| 663 } | 664 } |
| OLD | NEW |