| 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 282 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 293 # Temporary until https:#googleplex-android-review.git.corp.google.com/#
/c/442220/ | 293 # Temporary until https:#googleplex-android-review.git.corp.google.com/#
/c/442220/ |
| 294 # lands. | 294 # lands. |
| 295 'SK_SUPPORT_LEGACY_GETTOTALCLIP', | 295 'SK_SUPPORT_LEGACY_GETTOTALCLIP', |
| 296 # Still need to switch Android to the new name for N32. | 296 # Still need to switch Android to the new name for N32. |
| 297 'kNative_8888_SkColorType kN32_SkColorType', | 297 'kNative_8888_SkColorType kN32_SkColorType', |
| 298 'SK_SUPPORT_LEGACY_PICTURE_CAN_RECORD', | 298 'SK_SUPPORT_LEGACY_PICTURE_CAN_RECORD', |
| 299 'SK_SUPPORT_DEPRECATED_RECORD_FLAGS', | 299 'SK_SUPPORT_DEPRECATED_RECORD_FLAGS', |
| 300 'SK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES', | 300 'SK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES', |
| 301 'SK_SUPPORT_LEGACY_PICTURE_HEADERS', | 301 'SK_SUPPORT_LEGACY_PICTURE_HEADERS', |
| 302 'SK_SUPPORT_LEGACY_BLURDRAWLOOPERCONSTRUCTORS', | 302 'SK_SUPPORT_LEGACY_BLURDRAWLOOPERCONSTRUCTORS', |
| 303 # Needed until we fix skbug.com/2440. |
| 304 'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG', |
| 303 ], | 305 ], |
| 304 }], | 306 }], |
| 305 | 307 |
| 306 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"]
', | 308 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"]
', |
| 307 { | 309 { |
| 308 'defines': [ | 310 'defines': [ |
| 309 'SK_SAMPLES_FOR_X', | 311 'SK_SAMPLES_FOR_X', |
| 310 'SK_BUILD_FOR_UNIX', | 312 'SK_BUILD_FOR_UNIX', |
| 311 ], | 313 ], |
| 312 'configurations': { | 314 'configurations': { |
| (...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 607 'defines': [ | 609 'defines': [ |
| 608 'SK_USE_POSIX_THREADS', | 610 'SK_USE_POSIX_THREADS', |
| 609 ], | 611 ], |
| 610 }], | 612 }], |
| 611 ], # end 'conditions' | 613 ], # end 'conditions' |
| 612 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details | 614 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details |
| 613 'xcode_settings': { | 615 'xcode_settings': { |
| 614 'SYMROOT': '<(DEPTH)/xcodebuild', | 616 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 615 }, | 617 }, |
| 616 } | 618 } |
| OLD | NEW |