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

Side by Side Diff: gyp/common_conditions.gypi

Issue 897953006: generalize FcFontRenderPrepare supression (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: ios too? Created 5 years, 10 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 | tools/valgrind.supp » ('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_DISTANCE_FIELD_TEXT=<(skia_force_distance_field_text)', 8 'SK_FORCE_DISTANCE_FIELD_TEXT=<(skia_force_distance_field_text)',
9 ], 9 ],
10 'conditions' : [ 10 'conditions' : [
(...skipping 568 matching lines...) Expand 10 before | Expand all | Expand 10 after
579 }, 579 },
580 'xcode_settings': { 580 'xcode_settings': {
581 'ARCHS': ['armv7'], 581 'ARCHS': ['armv7'],
582 'CODE_SIGNING_REQUIRED': 'NO', 582 'CODE_SIGNING_REQUIRED': 'NO',
583 'CODE_SIGN_IDENTITY[sdk=iphoneos*]': '', 583 'CODE_SIGN_IDENTITY[sdk=iphoneos*]': '',
584 'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_sdk_version)', 584 'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_sdk_version)',
585 'SDKROOT': 'iphoneos', 585 'SDKROOT': 'iphoneos',
586 'TARGETED_DEVICE_FAMILY': '1,2', 586 'TARGETED_DEVICE_FAMILY': '1,2',
587 'GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO': 'NO', # -Wno-invalid-offset of 587 'GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO': 'NO', # -Wno-invalid-offset of
588 'OTHER_CPLUSPLUSFLAGS': [ 588 'OTHER_CPLUSPLUSFLAGS': [
589 '-std=c++0x',
589 '-fvisibility=hidden', 590 '-fvisibility=hidden',
590 '-fvisibility-inlines-hidden', 591 '-fvisibility-inlines-hidden',
591 ], 592 ],
592 'GCC_THUMB_SUPPORT': 'NO', 593 'GCC_THUMB_SUPPORT': 'NO',
593 }, 594 },
594 }, 595 },
595 ], 596 ],
596 597
597 [ 'skia_os == "android"', 598 [ 'skia_os == "android"',
598 { 599 {
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
656 [ 'skia_is_bot', { 657 [ 'skia_is_bot', {
657 'defines': [ 'SK_CRASH_HANDLER' ], 658 'defines': [ 'SK_CRASH_HANDLER' ],
658 }], 659 }],
659 660
660 ], # end 'conditions' 661 ], # end 'conditions'
661 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 662 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
662 'xcode_settings': { 663 'xcode_settings': {
663 'SYMROOT': '<(DEPTH)/xcodebuild', 664 'SYMROOT': '<(DEPTH)/xcodebuild',
664 }, 665 },
665 } 666 }
OLDNEW
« no previous file with comments | « no previous file | tools/valgrind.supp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698