| 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 289 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 300 # Temporary until https:#googleplex-android-review.git.corp.google.com/#
/c/442220/ | 300 # Temporary until https:#googleplex-android-review.git.corp.google.com/#
/c/442220/ |
| 301 # lands. | 301 # lands. |
| 302 'SK_SUPPORT_LEGACY_GETTOTALCLIP', | 302 'SK_SUPPORT_LEGACY_GETTOTALCLIP', |
| 303 # Still need to switch Android to the new name for N32. | 303 # Still need to switch Android to the new name for N32. |
| 304 'kNative_8888_SkColorType kN32_SkColorType', | 304 'kNative_8888_SkColorType kN32_SkColorType', |
| 305 'SK_SUPPORT_LEGACY_PICTURE_CAN_RECORD', | 305 'SK_SUPPORT_LEGACY_PICTURE_CAN_RECORD', |
| 306 'SK_SUPPORT_DEPRECATED_RECORD_FLAGS', | 306 'SK_SUPPORT_DEPRECATED_RECORD_FLAGS', |
| 307 'SK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES', | 307 'SK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES', |
| 308 'SK_SUPPORT_LEGACY_PICTURE_HEADERS', | 308 'SK_SUPPORT_LEGACY_PICTURE_HEADERS', |
| 309 'SK_SUPPORT_LEGACY_BLURDRAWLOOPERCONSTRUCTORS', | 309 'SK_SUPPORT_LEGACY_BLURDRAWLOOPERCONSTRUCTORS', |
| 310 'SK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE', |
| 310 # Needed until we fix skbug.com/2440. | 311 # Needed until we fix skbug.com/2440. |
| 311 'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG', | 312 'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG', |
| 312 # Transitional, for deprecated SkCanvas::SaveFlags methods. | 313 # Transitional, for deprecated SkCanvas::SaveFlags methods. |
| 313 'SK_ATTR_DEPRECATED=SK_NOTHING_ARG1', | 314 'SK_ATTR_DEPRECATED=SK_NOTHING_ARG1', |
| 314 ], | 315 ], |
| 315 }], | 316 }], |
| 316 | 317 |
| 317 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"]
', | 318 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"]
', |
| 318 { | 319 { |
| 319 'defines': [ | 320 'defines': [ |
| (...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 618 'defines': [ | 619 'defines': [ |
| 619 'SK_USE_POSIX_THREADS', | 620 'SK_USE_POSIX_THREADS', |
| 620 ], | 621 ], |
| 621 }], | 622 }], |
| 622 ], # end 'conditions' | 623 ], # end 'conditions' |
| 623 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details | 624 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details |
| 624 'xcode_settings': { | 625 'xcode_settings': { |
| 625 'SYMROOT': '<(DEPTH)/xcodebuild', | 626 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 626 }, | 627 }, |
| 627 } | 628 } |
| OLD | NEW |