| 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 627 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 638 }, | 638 }, |
| 639 'libraries': [ | 639 'libraries': [ |
| 640 '-lstdc++', | 640 '-lstdc++', |
| 641 '-lm', | 641 '-lm', |
| 642 '-llog', | 642 '-llog', |
| 643 ], | 643 ], |
| 644 'cflags': [ | 644 'cflags': [ |
| 645 '-fuse-ld=gold', | 645 '-fuse-ld=gold', |
| 646 ], | 646 ], |
| 647 'conditions': [ | 647 'conditions': [ |
| 648 [ 'skia_arch_type == "x86"', { | |
| 649 'cflags': [ | |
| 650 '-mssse3', | |
| 651 ], | |
| 652 }], | |
| 653 [ 'skia_android_framework', { | 648 [ 'skia_android_framework', { |
| 654 'libraries!': [ | 649 'libraries!': [ |
| 655 '-lstdc++', | 650 '-lstdc++', |
| 656 '-lm', | 651 '-lm', |
| 657 ], | 652 ], |
| 658 'cflags!': [ | 653 'cflags!': [ |
| 659 '-fuse-ld=gold', | 654 '-fuse-ld=gold', |
| 660 ], | 655 ], |
| 661 }], | 656 }], |
| 662 [ 'skia_shared_lib', { | 657 [ 'skia_shared_lib', { |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 694 [ 'skia_crash_handler', { | 689 [ 'skia_crash_handler', { |
| 695 'defines': [ 'SK_CRASH_HANDLER' ], | 690 'defines': [ 'SK_CRASH_HANDLER' ], |
| 696 }], | 691 }], |
| 697 | 692 |
| 698 ], # end 'conditions' | 693 ], # end 'conditions' |
| 699 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details | 694 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details |
| 700 'xcode_settings': { | 695 'xcode_settings': { |
| 701 'SYMROOT': '<(DEPTH)/xcodebuild', | 696 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 702 }, | 697 }, |
| 703 } | 698 } |
| OLD | NEW |