Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Side by Side Diff: gyp/common_conditions.gypi

Issue 305593002: Use SkAtomics_sync on Android (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | gyp/core.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 # compliant optimizations. 298 # compliant optimizations.
299 'SK_BUILD_FOR_ANDROID_FRAMEWORK', 299 'SK_BUILD_FOR_ANDROID_FRAMEWORK',
300 # Optimizations for chromium (m30) 300 # Optimizations for chromium (m30)
301 'GR_GL_CUSTOM_SETUP_HEADER "gl/GrGLConfig_chrome.h"', 301 'GR_GL_CUSTOM_SETUP_HEADER "gl/GrGLConfig_chrome.h"',
302 'IGNORE_ROT_AA_RECT_OPT', 302 'IGNORE_ROT_AA_RECT_OPT',
303 # Disable this check because it is too strict for some chromium-specific 303 # Disable this check because it is too strict for some chromium-specific
304 # subclasses of SkPixelRef. See bug: crbug.com/171776. 304 # subclasses of SkPixelRef. See bug: crbug.com/171776.
305 'SK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK', 305 'SK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK',
306 'SkLONGLONG int64_t', 306 'SkLONGLONG int64_t',
307 'SK_DEFAULT_FONT_CACHE_LIMIT (768 * 1024)', 307 'SK_DEFAULT_FONT_CACHE_LIMIT (768 * 1024)',
308 'SK_ATOMICS_PLATFORM_H "../../src/ports/SkAtomics_android.h"', 308 'SK_ATOMICS_PLATFORM_H "../../src/ports/SkAtomics_sync.h"',
309 'SK_MUTEX_PLATFORM_H "../../src/ports/SkMutex_pthread.h"', 309 'SK_MUTEX_PLATFORM_H "../../src/ports/SkMutex_pthread.h"',
310 # Still need to switch Android to the new name for N32. 310 # Still need to switch Android to the new name for N32.
311 'kNative_8888_SkColorType kN32_SkColorType', 311 'kNative_8888_SkColorType kN32_SkColorType',
312 'SK_SUPPORT_LEGACY_PICTURE_CAN_RECORD', 312 'SK_SUPPORT_LEGACY_PICTURE_CAN_RECORD',
313 'SK_SUPPORT_DEPRECATED_RECORD_FLAGS', 313 'SK_SUPPORT_DEPRECATED_RECORD_FLAGS',
314 'SK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES', 314 'SK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES',
315 'SK_SUPPORT_LEGACY_PICTURE_HEADERS', 315 'SK_SUPPORT_LEGACY_PICTURE_HEADERS',
316 'SK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE', 316 'SK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE',
317 # Needed until we fix skbug.com/2440. 317 # Needed until we fix skbug.com/2440.
318 'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG', 318 'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG',
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
654 'SK_BUILD_JSON_WRITER', 654 'SK_BUILD_JSON_WRITER',
655 ] 655 ]
656 }], 656 }],
657 657
658 ], # end 'conditions' 658 ], # end 'conditions'
659 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 659 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
660 'xcode_settings': { 660 'xcode_settings': {
661 'SYMROOT': '<(DEPTH)/xcodebuild', 661 'SYMROOT': '<(DEPTH)/xcodebuild',
662 }, 662 },
663 } 663 }
OLDNEW
« no previous file with comments | « no previous file | gyp/core.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698