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