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

Side by Side Diff: gyp/common_conditions.gypi

Issue 301283003: Revert "Revert of setConfig -> setInfo (https://codereview.chromium.org/308683005/)" (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: add guard for android Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « gm/gmmain.cpp ('k') | gyp/skia_for_chromium_defines.gypi » ('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 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 'SK_DEFAULT_FONT_CACHE_LIMIT (768 * 1024)', 307 'SK_DEFAULT_FONT_CACHE_LIMIT (768 * 1024)',
308 'SK_ATOMICS_PLATFORM_H "../../src/ports/SkAtomics_sync.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 'SK_SUPPORT_LEGACY_SETCONFIG_INFO',
317 # Needed until we fix skbug.com/2440. 318 # Needed until we fix skbug.com/2440.
318 'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG', 319 'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG',
319 # Transitional, for deprecated SkCanvas::SaveFlags methods. 320 # Transitional, for deprecated SkCanvas::SaveFlags methods.
320 'SK_ATTR_DEPRECATED=SK_NOTHING_ARG1', 321 'SK_ATTR_DEPRECATED=SK_NOTHING_ARG1',
321 'SK_SUPPORT_LEGACY_SHADER_LOCALMATRIX', 322 'SK_SUPPORT_LEGACY_SHADER_LOCALMATRIX',
322 'SK_DEFAULT_GLOBAL_DISCARDABLE_MEMORY_POOL_SIZE (512 * 1024)', 323 'SK_DEFAULT_GLOBAL_DISCARDABLE_MEMORY_POOL_SIZE (512 * 1024)',
323 ], 324 ],
324 }], 325 }],
325 326
326 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"] ', 327 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"] ',
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
655 'SK_BUILD_JSON_WRITER', 656 'SK_BUILD_JSON_WRITER',
656 ] 657 ]
657 }], 658 }],
658 659
659 ], # end 'conditions' 660 ], # end 'conditions'
660 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 661 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
661 'xcode_settings': { 662 'xcode_settings': {
662 'SYMROOT': '<(DEPTH)/xcodebuild', 663 'SYMROOT': '<(DEPTH)/xcodebuild',
663 }, 664 },
664 } 665 }
OLDNEW
« no previous file with comments | « gm/gmmain.cpp ('k') | gyp/skia_for_chromium_defines.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698