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

Side by Side Diff: gyp/common_conditions.gypi

Issue 229133003: Disable SK_GAMMA_SRGB on android builds. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: correct android gamma Created 6 years, 8 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 534 matching lines...) Expand 10 before | Expand all | Expand 10 after
545 'GCC_THUMB_SUPPORT': 'NO', 545 'GCC_THUMB_SUPPORT': 'NO',
546 }, 546 },
547 }, 547 },
548 ], 548 ],
549 549
550 [ 'skia_os == "android"', 550 [ 'skia_os == "android"',
551 { 551 {
552 'defines': [ 552 'defines': [
553 'SK_BUILD_FOR_ANDROID', 553 'SK_BUILD_FOR_ANDROID',
554 'SK_FONTHOST_DOES_NOT_USE_FONTMGR', 554 'SK_FONTHOST_DOES_NOT_USE_FONTMGR',
555
556 # Android Text Tuning
557 'SK_GAMMA_EXPONENT=1.4',
558 'SK_GAMMA_CONTRAST=0.0',
559 ],
560 # Android defines a fixed gamma exponent instead of using SRGB
561 'defines!': [
562 'SK_GAMMA_SRGB',
555 ], 563 ],
556 'configurations': { 564 'configurations': {
557 'Debug': { 565 'Debug': {
558 'cflags': ['-g'] 566 'cflags': ['-g']
559 }, 567 },
560 'Release': { 568 'Release': {
561 'cflags': ['-O2'], 569 'cflags': ['-O2'],
562 'defines': [ 'NDEBUG' ], 570 'defines': [ 'NDEBUG' ],
563 }, 571 },
564 }, 572 },
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
602 'defines': [ 610 'defines': [
603 'SK_USE_POSIX_THREADS', 611 'SK_USE_POSIX_THREADS',
604 ], 612 ],
605 }], 613 }],
606 ], # end 'conditions' 614 ], # end 'conditions'
607 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 615 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
608 'xcode_settings': { 616 'xcode_settings': {
609 'SYMROOT': '<(DEPTH)/xcodebuild', 617 'SYMROOT': '<(DEPTH)/xcodebuild',
610 }, 618 },
611 } 619 }
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