Chromium Code Reviews| 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' : [ |
| 11 ['skia_pic', { | |
| 12 'cflags': [ | |
| 13 '-fPIC', | |
| 14 ], | |
| 15 }], | |
| 11 [ 'skia_arch_type == "arm64"', { | 16 [ 'skia_arch_type == "arm64"', { |
| 12 'cflags': [ | 17 'cflags': [ |
| 13 '-ffp-contract=off', | 18 '-ffp-contract=off', |
| 14 ], | 19 ], |
| 15 }], | 20 }], |
| 16 | 21 |
| 17 # As of M35, Chrome requires SSE2 on x86 (and SSSE3 on Mac). | 22 # As of M35, Chrome requires SSE2 on x86 (and SSSE3 on Mac). |
| 18 [ 'skia_arch_type == "x86"', { | 23 [ 'skia_arch_type == "x86"', { |
| 19 'cflags': [ | 24 'cflags': [ |
| 20 '-msse2', | 25 '-msse2', |
| (...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 396 }, | 401 }, |
| 397 'Release': { | 402 'Release': { |
| 398 'cflags': [ | 403 'cflags': [ |
| 399 '-O<(skia_release_optimization_level)', | 404 '-O<(skia_release_optimization_level)', |
| 400 ], | 405 ], |
| 401 'defines': [ 'NDEBUG' ], | 406 'defines': [ 'NDEBUG' ], |
| 402 }, | 407 }, |
| 403 }, | 408 }, |
| 404 'conditions' : [ | 409 'conditions' : [ |
| 405 [ 'skia_shared_lib', { | 410 [ 'skia_shared_lib', { |
| 406 'cflags': [ | |
| 407 '-fPIC', | |
| 408 ], | |
| 409 'defines': [ | 411 'defines': [ |
| 410 'SKIA_DLL', | 412 'SKIA_DLL', |
| 411 'SKIA_IMPLEMENTATION=1', | 413 'SKIA_IMPLEMENTATION=1', |
| 412 ], | 414 ], |
| 413 }], | 415 }], |
| 414 [ 'skia_os == "nacl"', { | 416 [ 'skia_os == "nacl"', { |
| 415 'defines': [ | 417 'defines': [ |
| 416 'SK_BUILD_FOR_NACL', | 418 'SK_BUILD_FOR_NACL', |
| 417 ], | 419 ], |
| 418 'variables': { | 420 'variables': { |
| (...skipping 23 matching lines...) Expand all Loading... | |
| 442 [ 'skia_sanitizer', { | 444 [ 'skia_sanitizer', { |
| 443 'cflags': [ | 445 'cflags': [ |
| 444 '-fsanitize=<(skia_sanitizer)', | 446 '-fsanitize=<(skia_sanitizer)', |
| 445 ], | 447 ], |
| 446 'ldflags': [ | 448 'ldflags': [ |
| 447 '-fsanitize=<(skia_sanitizer)', | 449 '-fsanitize=<(skia_sanitizer)', |
| 448 ], | 450 ], |
| 449 'conditions' : [ | 451 'conditions' : [ |
| 450 [ 'skia_sanitizer == "thread"', { | 452 [ 'skia_sanitizer == "thread"', { |
| 451 'defines': [ 'SK_DYNAMIC_ANNOTATIONS_ENABLED=1' ], | 453 'defines': [ 'SK_DYNAMIC_ANNOTATIONS_ENABLED=1' ], |
| 452 'cflags': [ '-fPIC' ], | |
| 453 'target_conditions': [ | 454 'target_conditions': [ |
| 454 [ '_type == "executable"', { | 455 [ '_type == "executable"', { |
|
mtklein
2014/07/19 14:49:19
Can we make skia_pic imply PIE executables too, or
djsollen
2014/07/22 14:20:17
We need PIE for android executables as well. The
scroggo
2014/07/22 14:53:36
(Derek and I discussed in person, but for posterit
| |
| 455 'cflags': [ '-fPIE' ], | 456 'cflags': [ '-fPIE' ], |
| 456 'ldflags': [ '-pie' ], | 457 'ldflags': [ '-pie' ], |
| 457 }], | 458 }], |
| 458 ], | 459 ], |
| 459 }], | 460 }], |
| 460 [ 'skia_sanitizer == "undefined"', { | 461 [ 'skia_sanitizer == "undefined"', { |
| 461 'cflags': [ '-fPIC' ], | |
| 462 'cflags_cc!': ['-fno-rtti'], | 462 'cflags_cc!': ['-fno-rtti'], |
| 463 'target_conditions': [ | 463 'target_conditions': [ |
| 464 [ '_type == "executable"', { | 464 [ '_type == "executable"', { |
| 465 'cflags': [ '-fPIE' ], | 465 'cflags': [ '-fPIE' ], |
| 466 'ldflags': [ '-pie' ], | 466 'ldflags': [ '-pie' ], |
| 467 }], | 467 }], |
| 468 ], | 468 ], |
| 469 }], | 469 }], |
| 470 ], | 470 ], |
| 471 }], | 471 }], |
| (...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 657 [ 'skia_android_framework', { | 657 [ 'skia_android_framework', { |
| 658 'libraries!': [ | 658 'libraries!': [ |
| 659 '-lstdc++', | 659 '-lstdc++', |
| 660 '-lm', | 660 '-lm', |
| 661 ], | 661 ], |
| 662 'cflags!': [ | 662 'cflags!': [ |
| 663 '-fuse-ld=gold', | 663 '-fuse-ld=gold', |
| 664 ], | 664 ], |
| 665 }], | 665 }], |
| 666 [ 'skia_shared_lib', { | 666 [ 'skia_shared_lib', { |
| 667 'cflags': [ | |
| 668 '-fPIC', | |
| 669 ], | |
| 670 'defines': [ | 667 'defines': [ |
| 671 'SKIA_DLL', | 668 'SKIA_DLL', |
| 672 'SKIA_IMPLEMENTATION=1', | 669 'SKIA_IMPLEMENTATION=1', |
| 673 # Needed until we fix skbug.com/2440. | 670 # Needed until we fix skbug.com/2440. |
| 674 'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG', | 671 'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG', |
| 675 ], | 672 ], |
| 676 }], | 673 }], |
| 677 [ 'skia_profile_enabled == 1', { | 674 [ 'skia_profile_enabled == 1', { |
| 678 'cflags': ['-g', '-fno-omit-frame-pointer', '-marm', '-mapcs'], | 675 'cflags': ['-g', '-fno-omit-frame-pointer', '-marm', '-mapcs'], |
| 679 }], | 676 }], |
| (...skipping 18 matching lines...) Expand all Loading... | |
| 698 [ 'skia_crash_handler', { | 695 [ 'skia_crash_handler', { |
| 699 'defines': [ 'SK_CRASH_HANDLER' ], | 696 'defines': [ 'SK_CRASH_HANDLER' ], |
| 700 }], | 697 }], |
| 701 | 698 |
| 702 ], # end 'conditions' | 699 ], # end 'conditions' |
| 703 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details | 700 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details |
| 704 'xcode_settings': { | 701 'xcode_settings': { |
| 705 'SYMROOT': '<(DEPTH)/xcodebuild', | 702 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 706 }, | 703 }, |
| 707 } | 704 } |
| OLD | NEW |