| 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 277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 288 'SK_DEFAULT_FONT_CACHE_LIMIT (768 * 1024)', | 288 'SK_DEFAULT_FONT_CACHE_LIMIT (768 * 1024)', |
| 289 'SK_ATOMICS_PLATFORM_H "../../src/ports/SkAtomics_android.h"', | 289 'SK_ATOMICS_PLATFORM_H "../../src/ports/SkAtomics_android.h"', |
| 290 'SK_MUTEX_PLATFORM_H "../../src/ports/SkMutex_pthread.h"', | 290 'SK_MUTEX_PLATFORM_H "../../src/ports/SkMutex_pthread.h"', |
| 291 # FIXME: b/13729784: Need to rework LayerRasterizer.cpp | 291 # FIXME: b/13729784: Need to rework LayerRasterizer.cpp |
| 292 'SK_SUPPORT_LEGACY_LAYERRASTERIZER_API', | 292 'SK_SUPPORT_LEGACY_LAYERRASTERIZER_API', |
| 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 ], | 299 ], |
| 299 }], | 300 }], |
| 300 | 301 |
| 301 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"]
', | 302 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"]
', |
| 302 { | 303 { |
| 303 'defines': [ | 304 'defines': [ |
| 304 'SK_SAMPLES_FOR_X', | 305 'SK_SAMPLES_FOR_X', |
| 305 'SK_BUILD_FOR_UNIX', | 306 'SK_BUILD_FOR_UNIX', |
| 306 ], | 307 ], |
| 307 'configurations': { | 308 'configurations': { |
| (...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 602 'defines': [ | 603 'defines': [ |
| 603 'SK_USE_POSIX_THREADS', | 604 'SK_USE_POSIX_THREADS', |
| 604 ], | 605 ], |
| 605 }], | 606 }], |
| 606 ], # end 'conditions' | 607 ], # end 'conditions' |
| 607 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details | 608 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details |
| 608 'xcode_settings': { | 609 'xcode_settings': { |
| 609 'SYMROOT': '<(DEPTH)/xcodebuild', | 610 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 610 }, | 611 }, |
| 611 } | 612 } |
| OLD | NEW |