| 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 317 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 328 'SK_SFNTLY_SUBSETTER "sample/chromium/font_subsetter.h"', | 328 'SK_SFNTLY_SUBSETTER "sample/chromium/font_subsetter.h"', |
| 329 # When built as part of the system image we can enable certian non-NDK | 329 # When built as part of the system image we can enable certian non-NDK |
| 330 # compliant optimizations. | 330 # compliant optimizations. |
| 331 'SK_BUILD_FOR_ANDROID_FRAMEWORK', | 331 'SK_BUILD_FOR_ANDROID_FRAMEWORK', |
| 332 # Optimizations for chromium (m30) | 332 # Optimizations for chromium (m30) |
| 333 'GR_GL_CUSTOM_SETUP_HEADER "gl/GrGLConfig_chrome.h"', | 333 'GR_GL_CUSTOM_SETUP_HEADER "gl/GrGLConfig_chrome.h"', |
| 334 'IGNORE_ROT_AA_RECT_OPT', | 334 'IGNORE_ROT_AA_RECT_OPT', |
| 335 # Disable this check because it is too strict for some chromium-specific | 335 # Disable this check because it is too strict for some chromium-specific |
| 336 # subclasses of SkPixelRef. See bug: crbug.com/171776. | 336 # subclasses of SkPixelRef. See bug: crbug.com/171776. |
| 337 'SK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK', | 337 'SK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK', |
| 338 'SkLONGLONG int64_t', | |
| 339 'SK_DEFAULT_FONT_CACHE_LIMIT (768 * 1024)', | 338 'SK_DEFAULT_FONT_CACHE_LIMIT (768 * 1024)', |
| 340 'SK_ATOMICS_PLATFORM_H "../../src/ports/SkAtomics_sync.h"', | 339 'SK_ATOMICS_PLATFORM_H "../../src/ports/SkAtomics_sync.h"', |
| 341 'SK_MUTEX_PLATFORM_H "../../src/ports/SkMutex_pthread.h"', | 340 'SK_MUTEX_PLATFORM_H "../../src/ports/SkMutex_pthread.h"', |
| 342 # Still need to switch Android to the new name for N32. | 341 # Still need to switch Android to the new name for N32. |
| 343 'kNative_8888_SkColorType kN32_SkColorType', | 342 'kNative_8888_SkColorType kN32_SkColorType', |
| 344 # Needed until we fix skbug.com/2440. | 343 # Needed until we fix skbug.com/2440. |
| 345 'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG', | 344 'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG', |
| 346 # Transitional, for deprecated SkCanvas::SaveFlags methods. | 345 # Transitional, for deprecated SkCanvas::SaveFlags methods. |
| 347 'SK_ATTR_DEPRECATED=SK_NOTHING_ARG1', | 346 'SK_ATTR_DEPRECATED=SK_NOTHING_ARG1', |
| 348 'SK_SUPPORT_LEGACY_SHADER_LOCALMATRIX', | 347 'SK_SUPPORT_LEGACY_SHADER_LOCALMATRIX', |
| (...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 677 # add flags here (e.g. SK_SUPPORT_LEGACY_...) needed by moz2d | 676 # add flags here (e.g. SK_SUPPORT_LEGACY_...) needed by moz2d |
| 678 ], | 677 ], |
| 679 }], | 678 }], |
| 680 | 679 |
| 681 ], # end 'conditions' | 680 ], # end 'conditions' |
| 682 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details | 681 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details |
| 683 'xcode_settings': { | 682 'xcode_settings': { |
| 684 'SYMROOT': '<(DEPTH)/xcodebuild', | 683 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 685 }, | 684 }, |
| 686 } | 685 } |
| OLD | NEW |