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

Side by Side Diff: gyp/common_conditions.gypi

Issue 284663004: Fix the android framework build as it still uses mutable local matrices. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | 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 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 'SK_SUPPORT_LEGACY_PICTURE_CAN_RECORD', 306 'SK_SUPPORT_LEGACY_PICTURE_CAN_RECORD',
307 'SK_SUPPORT_DEPRECATED_RECORD_FLAGS', 307 'SK_SUPPORT_DEPRECATED_RECORD_FLAGS',
308 'SK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES', 308 'SK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES',
309 'SK_SUPPORT_LEGACY_PICTURE_HEADERS', 309 'SK_SUPPORT_LEGACY_PICTURE_HEADERS',
310 'SK_SUPPORT_LEGACY_BLURDRAWLOOPERCONSTRUCTORS', 310 'SK_SUPPORT_LEGACY_BLURDRAWLOOPERCONSTRUCTORS',
311 'SK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE', 311 'SK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE',
312 # Needed until we fix skbug.com/2440. 312 # Needed until we fix skbug.com/2440.
313 'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG', 313 'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG',
314 # Transitional, for deprecated SkCanvas::SaveFlags methods. 314 # Transitional, for deprecated SkCanvas::SaveFlags methods.
315 'SK_ATTR_DEPRECATED=SK_NOTHING_ARG1', 315 'SK_ATTR_DEPRECATED=SK_NOTHING_ARG1',
316 'SK_SUPPORT_LEGACY_SHADER_LOCALMATRIX',
316 ], 317 ],
317 }], 318 }],
318 319
319 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"] ', 320 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"] ',
320 { 321 {
321 'defines': [ 322 'defines': [
322 'SK_SAMPLES_FOR_X', 323 'SK_SAMPLES_FOR_X',
323 'SK_BUILD_FOR_UNIX', 324 'SK_BUILD_FOR_UNIX',
324 ], 325 ],
325 'configurations': { 326 'configurations': {
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
639 'SK_SUPPORT_LEGACY_GETTOTALCLIP=1', 640 'SK_SUPPORT_LEGACY_GETTOTALCLIP=1',
640 ], 641 ],
641 }], 642 }],
642 643
643 ], # end 'conditions' 644 ], # end 'conditions'
644 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 645 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
645 'xcode_settings': { 646 'xcode_settings': {
646 'SYMROOT': '<(DEPTH)/xcodebuild', 647 'SYMROOT': '<(DEPTH)/xcodebuild',
647 }, 648 },
648 } 649 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698