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