| 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_DISTANCEFIELD_FONTS=<(skia_force_distancefield_fonts)', | 8 'SK_FORCE_DISTANCEFIELD_FONTS=<(skia_force_distancefield_fonts)', |
| 9 ], | 9 ], |
| 10 'conditions' : [ | 10 'conditions' : [ |
| (...skipping 488 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 499 [ 'skia_arch_width == 64', { 'ARCHS': ['x86_64'] }], | 499 [ 'skia_arch_width == 64', { 'ARCHS': ['x86_64'] }], |
| 500 [ 'skia_osx_deployment_target==""', { | 500 [ 'skia_osx_deployment_target==""', { |
| 501 'MACOSX_DEPLOYMENT_TARGET': '10.6', # -mmacos-version-min, passed
in env to ld. | 501 'MACOSX_DEPLOYMENT_TARGET': '10.6', # -mmacos-version-min, passed
in env to ld. |
| 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 'GCC_CW_ASM_SYNTAX': 'NO', # remove -fasm-bl
ocks |
| 510 'GCC_ENABLE_PASCAL_STRINGS': 'NO', # remove -mpascal
-strings |
| 511 'GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO': 'NO', # -Wno-invalid-of
fsetof |
| 509 'WARNING_CFLAGS': [ | 512 'WARNING_CFLAGS': [ |
| 510 '-Wall', | 513 '-Wall', |
| 511 '-Wextra', | 514 '-Wextra', |
| 512 '-Wno-invalid-offsetof', | |
| 513 '-Wno-unused-parameter', | 515 '-Wno-unused-parameter', |
| 514 '-Wno-uninitialized', # Disabled because we think GCC 4.2 is bad at
this. | 516 '-Wno-uninitialized', # Disabled because we think GCC 4.2 is bad at
this. |
| 515 ], | 517 ], |
| 516 }, | 518 }, |
| 517 }, | 519 }, |
| 518 ], | 520 ], |
| 519 | 521 |
| 520 [ 'skia_os == "ios"', | 522 [ 'skia_os == "ios"', |
| 521 { | 523 { |
| 522 'defines': [ | 524 'defines': [ |
| (...skipping 21 matching lines...) Expand all Loading... |
| 544 'defines': [ 'NDEBUG' ], | 546 'defines': [ 'NDEBUG' ], |
| 545 }, | 547 }, |
| 546 }, | 548 }, |
| 547 'xcode_settings': { | 549 'xcode_settings': { |
| 548 'ARCHS': ['armv7'], | 550 'ARCHS': ['armv7'], |
| 549 'CODE_SIGNING_REQUIRED': 'NO', | 551 'CODE_SIGNING_REQUIRED': 'NO', |
| 550 'CODE_SIGN_IDENTITY[sdk=iphoneos*]': '', | 552 'CODE_SIGN_IDENTITY[sdk=iphoneos*]': '', |
| 551 'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_sdk_version)', | 553 'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_sdk_version)', |
| 552 'SDKROOT': 'iphoneos', | 554 'SDKROOT': 'iphoneos', |
| 553 'TARGETED_DEVICE_FAMILY': '1,2', | 555 'TARGETED_DEVICE_FAMILY': '1,2', |
| 556 'GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO': 'NO', # -Wno-invalid-offset
of |
| 554 'OTHER_CPLUSPLUSFLAGS': [ | 557 'OTHER_CPLUSPLUSFLAGS': [ |
| 555 '-Wno-invalid-offsetof', | |
| 556 '-fvisibility=hidden', | 558 '-fvisibility=hidden', |
| 557 '-fvisibility-inlines-hidden', | 559 '-fvisibility-inlines-hidden', |
| 558 ], | 560 ], |
| 559 'GCC_THUMB_SUPPORT': 'NO', | 561 'GCC_THUMB_SUPPORT': 'NO', |
| 560 }, | 562 }, |
| 561 }, | 563 }, |
| 562 ], | 564 ], |
| 563 | 565 |
| 564 [ 'skia_os == "android"', | 566 [ 'skia_os == "android"', |
| 565 { | 567 { |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 631 [ 'skia_is_bot', { | 633 [ 'skia_is_bot', { |
| 632 'defines': [ 'SK_CRASH_HANDLER' ], | 634 'defines': [ 'SK_CRASH_HANDLER' ], |
| 633 }], | 635 }], |
| 634 | 636 |
| 635 ], # end 'conditions' | 637 ], # end 'conditions' |
| 636 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details | 638 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details |
| 637 'xcode_settings': { | 639 'xcode_settings': { |
| 638 'SYMROOT': '<(DEPTH)/xcodebuild', | 640 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 639 }, | 641 }, |
| 640 } | 642 } |
| OLD | NEW |