| 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 515 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 526 }, | 526 }, |
| 527 }, | 527 }, |
| 528 'Release': { | 528 'Release': { |
| 529 'xcode_settings': { | 529 'xcode_settings': { |
| 530 'GCC_OPTIMIZATION_LEVEL': '<(skia_release_optimization_level)', | 530 'GCC_OPTIMIZATION_LEVEL': '<(skia_release_optimization_level)', |
| 531 }, | 531 }, |
| 532 'defines': [ 'NDEBUG' ], | 532 'defines': [ 'NDEBUG' ], |
| 533 }, | 533 }, |
| 534 }, | 534 }, |
| 535 'xcode_settings': { | 535 'xcode_settings': { |
| 536 'ARCHS': ['armv6', 'armv7'], | 536 'ARCHS': ['armv7'], |
| 537 'CODE_SIGNING_REQUIRED': 'NO', | 537 'CODE_SIGNING_REQUIRED': 'NO', |
| 538 'CODE_SIGN_IDENTITY[sdk=iphoneos*]': '', | 538 'CODE_SIGN_IDENTITY[sdk=iphoneos*]': '', |
| 539 'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_sdk_version)', | 539 'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_sdk_version)', |
| 540 'SDKROOT': 'iphoneos', | 540 'SDKROOT': 'iphoneos', |
| 541 'TARGETED_DEVICE_FAMILY': '1,2', | 541 'TARGETED_DEVICE_FAMILY': '1,2', |
| 542 'OTHER_CPLUSPLUSFLAGS': [ | 542 'OTHER_CPLUSPLUSFLAGS': [ |
| 543 '-fvisibility=hidden', | 543 '-fvisibility=hidden', |
| 544 '-fvisibility-inlines-hidden', | 544 '-fvisibility-inlines-hidden', |
| 545 ], | 545 ], |
| 546 'GCC_THUMB_SUPPORT': 'NO', | 546 'GCC_THUMB_SUPPORT': 'NO', |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 603 'defines': [ | 603 'defines': [ |
| 604 'SK_USE_POSIX_THREADS', | 604 'SK_USE_POSIX_THREADS', |
| 605 ], | 605 ], |
| 606 }], | 606 }], |
| 607 ], # end 'conditions' | 607 ], # end 'conditions' |
| 608 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details | 608 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details |
| 609 'xcode_settings': { | 609 'xcode_settings': { |
| 610 'SYMROOT': '<(DEPTH)/xcodebuild', | 610 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 611 }, | 611 }, |
| 612 } | 612 } |
| OLD | NEW |