| 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 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 # Needed until we fix skbug.com/2440. | 310 # Needed until we fix skbug.com/2440. |
| 311 'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG', | 311 'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG', |
| 312 # For public API. |
| 313 'SK_SUPPORT_LEGACY_SAVEFLAGS', |
| 312 ], | 314 ], |
| 313 }], | 315 }], |
| 314 | 316 |
| 315 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"]
', | 317 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"]
', |
| 316 { | 318 { |
| 317 'defines': [ | 319 'defines': [ |
| 318 'SK_SAMPLES_FOR_X', | 320 'SK_SAMPLES_FOR_X', |
| 319 'SK_BUILD_FOR_UNIX', | 321 'SK_BUILD_FOR_UNIX', |
| 320 ], | 322 ], |
| 321 'configurations': { | 323 'configurations': { |
| (...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 616 'defines': [ | 618 'defines': [ |
| 617 'SK_USE_POSIX_THREADS', | 619 'SK_USE_POSIX_THREADS', |
| 618 ], | 620 ], |
| 619 }], | 621 }], |
| 620 ], # end 'conditions' | 622 ], # end 'conditions' |
| 621 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details | 623 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details |
| 622 'xcode_settings': { | 624 'xcode_settings': { |
| 623 'SYMROOT': '<(DEPTH)/xcodebuild', | 625 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 624 }, | 626 }, |
| 625 } | 627 } |
| OLD | NEW |