| OLD | NEW |
| 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 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 209 '-g', | 209 '-g', |
| 210 '-fno-exceptions', | 210 '-fno-exceptions', |
| 211 '-fstrict-aliasing', | 211 '-fstrict-aliasing', |
| 212 | 212 |
| 213 '-Wall', | 213 '-Wall', |
| 214 '-Wextra', | 214 '-Wextra', |
| 215 '-Winit-self', | 215 '-Winit-self', |
| 216 '-Wpointer-arith', | 216 '-Wpointer-arith', |
| 217 '-Wsign-compare', | 217 '-Wsign-compare', |
| 218 | 218 |
| 219 '-Wno-c++11-extensions', | |
| 220 '-Wno-unused-parameter', | 219 '-Wno-unused-parameter', |
| 221 ], | 220 ], |
| 222 'cflags_cc': [ | 221 'cflags_cc': [ |
| 222 '-std=c++11', |
| 223 '-fno-rtti', | 223 '-fno-rtti', |
| 224 '-Wnon-virtual-dtor', | 224 '-Wnon-virtual-dtor', |
| 225 '-Wno-invalid-offsetof', # GCC <4.6 is old-school strict about what i
s POD. | 225 '-Wno-invalid-offsetof', # GCC <4.6 is old-school strict about what i
s POD. |
| 226 ], | 226 ], |
| 227 'conditions': [ | 227 'conditions': [ |
| 228 [ 'skia_os != "chromeos"', { | 228 [ 'skia_os != "chromeos"', { |
| 229 'conditions': [ | 229 'conditions': [ |
| 230 [ 'skia_arch_width == 64 and skia_arch_type == "x86"', { | 230 [ 'skia_arch_width == 64 and skia_arch_type == "x86"', { |
| 231 'cflags': [ | 231 'cflags': [ |
| 232 '-m64', | 232 '-m64', |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 334 ], | 334 ], |
| 335 }], | 335 }], |
| 336 ], | 336 ], |
| 337 }], | 337 }], |
| 338 ], | 338 ], |
| 339 }], | 339 }], |
| 340 ], | 340 ], |
| 341 }, | 341 }, |
| 342 ], | 342 ], |
| 343 | 343 |
| 344 [ 'skia_os == "nacl"', { |
| 345 # NaCl compiler is GCC 4.4, which is too old to understand 'c++11', so cal
l it '0x'. |
| 346 # NaCl's newlib needs gnu++ mode to see snprintf, vsnprintf, etc in C++11
mode. |
| 347 'cflags_cc!': [ '-std=c++11' ], |
| 348 'cflags_cc' : [ '-std=gnu++0x' ], |
| 349 }], |
| 350 |
| 344 ['skia_android_framework', { | 351 ['skia_android_framework', { |
| 345 'includes' : [ | 352 'includes' : [ |
| 346 'skia_for_android_framework_defines.gypi', | 353 'skia_for_android_framework_defines.gypi', |
| 347 ], | 354 ], |
| 348 'cflags': [ | 355 'cflags': [ |
| 349 # Skia does not enforce this usage pattern so we disable it here to avoi
d | 356 # Skia does not enforce this usage pattern so we disable it here to avoi
d |
| 350 # unecessary log spew when building | 357 # unecessary log spew when building |
| 351 '-Wno-unused-parameter', | 358 '-Wno-unused-parameter', |
| 352 | 359 |
| 353 # Android's -D_FORTIFY_SOURCE=2 extensions are incompatibile with SkStri
ng. | 360 # Android's -D_FORTIFY_SOURCE=2 extensions are incompatibile with SkStri
ng. |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 472 [ 'skia_sanitizer == "thread"', { | 479 [ 'skia_sanitizer == "thread"', { |
| 473 'defines': [ 'DYNAMIC_ANNOTATIONS_ENABLED=1' ], | 480 'defines': [ 'DYNAMIC_ANNOTATIONS_ENABLED=1' ], |
| 474 }], | 481 }], |
| 475 [ 'skia_sanitizer == "undefined"', { | 482 [ 'skia_sanitizer == "undefined"', { |
| 476 'cflags_cc!': ['-fno-rtti'], | 483 'cflags_cc!': ['-fno-rtti'], |
| 477 }], | 484 }], |
| 478 ], | 485 ], |
| 479 }], | 486 }], |
| 480 [ 'skia_clang_build', { | 487 [ 'skia_clang_build', { |
| 481 'cflags_cc': [ | 488 'cflags_cc': [ |
| 482 # Build in C++11 mode to make sure we'll have an easy time switc
hing. | |
| 483 '-std=c++11', | |
| 484 '-Wno-unknown-warning-option', # Allows unknown warnings. | 489 '-Wno-unknown-warning-option', # Allows unknown warnings. |
| 485 '-Wno-deprecated', # From Qt, via debugger (older C
lang). | 490 '-Wno-deprecated', # From Qt, via debugger (older C
lang). |
| 486 '-Wno-deprecated-register', # From Qt, via debugger (newer C
lang). | 491 '-Wno-deprecated-register', # From Qt, via debugger (newer C
lang). |
| 487 ], | 492 ], |
| 488 'cflags': [ | 493 'cflags': [ |
| 489 # Extra warnings we like but that only Clang knows about. | 494 # Extra warnings we like but that only Clang knows about. |
| 490 '-Wstring-conversion', | 495 '-Wstring-conversion', |
| 491 ], | 496 ], |
| 492 'cflags!': [ | 497 'cflags!': [ |
| 493 '-mfpmath=sse', # Clang doesn't need to be told this, and somet
imes gets confused. | 498 '-mfpmath=sse', # Clang doesn't need to be told this, and somet
imes gets confused. |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 579 }, | 584 }, |
| 580 'xcode_settings': { | 585 'xcode_settings': { |
| 581 'ARCHS': ['armv7'], | 586 'ARCHS': ['armv7'], |
| 582 'CODE_SIGNING_REQUIRED': 'NO', | 587 'CODE_SIGNING_REQUIRED': 'NO', |
| 583 'CODE_SIGN_IDENTITY[sdk=iphoneos*]': '', | 588 'CODE_SIGN_IDENTITY[sdk=iphoneos*]': '', |
| 584 'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_sdk_version)', | 589 'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_sdk_version)', |
| 585 'SDKROOT': 'iphoneos', | 590 'SDKROOT': 'iphoneos', |
| 586 'TARGETED_DEVICE_FAMILY': '1,2', | 591 'TARGETED_DEVICE_FAMILY': '1,2', |
| 587 'GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO': 'NO', # -Wno-invalid-offset
of | 592 'GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO': 'NO', # -Wno-invalid-offset
of |
| 588 'OTHER_CPLUSPLUSFLAGS': [ | 593 'OTHER_CPLUSPLUSFLAGS': [ |
| 594 '-std=c++0x', |
| 589 '-fvisibility=hidden', | 595 '-fvisibility=hidden', |
| 590 '-fvisibility-inlines-hidden', | 596 '-fvisibility-inlines-hidden', |
| 591 ], | 597 ], |
| 592 'GCC_THUMB_SUPPORT': 'NO', | 598 'GCC_THUMB_SUPPORT': 'NO', |
| 593 }, | 599 }, |
| 594 }, | 600 }, |
| 595 ], | 601 ], |
| 596 | 602 |
| 597 [ 'skia_os == "android"', | 603 [ 'skia_os == "android"', |
| 598 { | 604 { |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 656 [ 'skia_is_bot', { | 662 [ 'skia_is_bot', { |
| 657 'defines': [ 'SK_CRASH_HANDLER' ], | 663 'defines': [ 'SK_CRASH_HANDLER' ], |
| 658 }], | 664 }], |
| 659 | 665 |
| 660 ], # end 'conditions' | 666 ], # end 'conditions' |
| 661 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details | 667 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details |
| 662 'xcode_settings': { | 668 'xcode_settings': { |
| 663 'SYMROOT': '<(DEPTH)/xcodebuild', | 669 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 664 }, | 670 }, |
| 665 } | 671 } |
| OLD | NEW |