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

Side by Side Diff: gyp/common_conditions.gypi

Issue 637593002: Add -Wno-invalid-offsetof to Mac and iOS builds too. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 2 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 | 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 491 matching lines...) Expand 10 before | Expand all | Expand 10 after
502 }, { 502 }, {
503 'MACOSX_DEPLOYMENT_TARGET': '<(skia_osx_deployment_target)', 503 'MACOSX_DEPLOYMENT_TARGET': '<(skia_osx_deployment_target)',
504 }], 504 }],
505 ], 505 ],
506 'GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS': 'YES', # -mssse3 506 'GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS': 'YES', # -mssse3
507 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', # -fvisibility=hi dden 507 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', # -fvisibility=hi dden
508 'GCC_INLINES_ARE_PRIVATE_EXTERN': 'NO', # -fvisibility-in lines-hidden 508 'GCC_INLINES_ARE_PRIVATE_EXTERN': 'NO', # -fvisibility-in lines-hidden
509 'WARNING_CFLAGS': [ 509 'WARNING_CFLAGS': [
510 '-Wall', 510 '-Wall',
511 '-Wextra', 511 '-Wextra',
512 '-Wno-invalid-offsetof',
tfarina 2014/10/07 20:05:53 looks fine, below too.
512 '-Wno-unused-parameter', 513 '-Wno-unused-parameter',
513 '-Wno-uninitialized', # Disabled because we think GCC 4.2 is bad at this. 514 '-Wno-uninitialized', # Disabled because we think GCC 4.2 is bad at this.
514 ], 515 ],
515 }, 516 },
516 }, 517 },
517 ], 518 ],
518 519
519 [ 'skia_os == "ios"', 520 [ 'skia_os == "ios"',
520 { 521 {
521 'defines': [ 522 'defines': [
(...skipping 22 matching lines...) Expand all
544 }, 545 },
545 }, 546 },
546 'xcode_settings': { 547 'xcode_settings': {
547 'ARCHS': ['armv7'], 548 'ARCHS': ['armv7'],
548 'CODE_SIGNING_REQUIRED': 'NO', 549 'CODE_SIGNING_REQUIRED': 'NO',
549 'CODE_SIGN_IDENTITY[sdk=iphoneos*]': '', 550 'CODE_SIGN_IDENTITY[sdk=iphoneos*]': '',
550 'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_sdk_version)', 551 'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_sdk_version)',
551 'SDKROOT': 'iphoneos', 552 'SDKROOT': 'iphoneos',
552 'TARGETED_DEVICE_FAMILY': '1,2', 553 'TARGETED_DEVICE_FAMILY': '1,2',
553 'OTHER_CPLUSPLUSFLAGS': [ 554 'OTHER_CPLUSPLUSFLAGS': [
555 '-Wno-invalid-offsetof',
554 '-fvisibility=hidden', 556 '-fvisibility=hidden',
555 '-fvisibility-inlines-hidden', 557 '-fvisibility-inlines-hidden',
556 ], 558 ],
557 'GCC_THUMB_SUPPORT': 'NO', 559 'GCC_THUMB_SUPPORT': 'NO',
558 }, 560 },
559 }, 561 },
560 ], 562 ],
561 563
562 [ 'skia_os == "android"', 564 [ 'skia_os == "android"',
563 { 565 {
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
629 [ 'skia_is_bot', { 631 [ 'skia_is_bot', {
630 'defines': [ 'SK_CRASH_HANDLER' ], 632 'defines': [ 'SK_CRASH_HANDLER' ],
631 }], 633 }],
632 634
633 ], # end 'conditions' 635 ], # end 'conditions'
634 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 636 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
635 'xcode_settings': { 637 'xcode_settings': {
636 'SYMROOT': '<(DEPTH)/xcodebuild', 638 'SYMROOT': '<(DEPTH)/xcodebuild',
637 }, 639 },
638 } 640 }
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