| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 # This gypi file handles the removal of platform-specific files from the | 5 # This gypi file handles the removal of platform-specific files from the |
| 6 # Skia build. | 6 # Skia build. |
| 7 { | 7 { |
| 8 'includes': [ | 8 'includes': [ |
| 9 # skia_for_chromium_defines.gypi defines skia_for_chromium_defines | 9 # skia_for_chromium_defines.gypi defines skia_for_chromium_defines |
| 10 '../third_party/skia/gyp/skia_for_chromium_defines.gypi', | 10 '../third_party/skia/gyp/skia_for_chromium_defines.gypi', |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 'defines': [ | 105 'defines': [ |
| 106 'SK_USE_POSIX_THREADS', | 106 'SK_USE_POSIX_THREADS', |
| 107 ], | 107 ], |
| 108 }, | 108 }, |
| 109 }], | 109 }], |
| 110 | 110 |
| 111 # Neon support. | 111 # Neon support. |
| 112 [ 'target_arch == "arm" and arm_version >= 7 and arm_neon == 1', { | 112 [ 'target_arch == "arm" and arm_version >= 7 and arm_neon == 1', { |
| 113 'defines': [ | 113 'defines': [ |
| 114 'SK_ARM_HAS_NEON', | 114 'SK_ARM_HAS_NEON', |
| 115 '__ARM_HAVE_NEON', | |
| 116 ], | 115 ], |
| 117 }], | 116 }], |
| 118 [ 'target_arch == "arm" and arm_version >= 7 and arm_neon_optional == 1', { | 117 [ 'target_arch == "arm" and arm_version >= 7 and arm_neon_optional == 1', { |
| 119 'defines': [ | 118 'defines': [ |
| 120 'SK_ARM_HAS_OPTIONAL_NEON', | 119 'SK_ARM_HAS_OPTIONAL_NEON', |
| 121 '__ARM_HAVE_OPTIONAL_NEON_SUPPORT', | |
| 122 ], | 120 ], |
| 123 }], | 121 }], |
| 124 ], | 122 ], |
| 125 | 123 |
| 126 'variables': { | 124 'variables': { |
| 127 'variables': { | 125 'variables': { |
| 128 'conditions': [ | 126 'conditions': [ |
| 129 ['OS== "ios"', { | 127 ['OS== "ios"', { |
| 130 'skia_support_gpu': 0, | 128 'skia_support_gpu': 0, |
| 131 }, { | 129 }, { |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 212 # re-export if they include Skia headers in their public headers. | 210 # re-export if they include Skia headers in their public headers. |
| 213 'all_dependent_settings': { | 211 'all_dependent_settings': { |
| 214 'include_dirs': [ | 212 'include_dirs': [ |
| 215 '..', | 213 '..', |
| 216 'config', | 214 'config', |
| 217 ], | 215 ], |
| 218 }, | 216 }, |
| 219 | 217 |
| 220 'msvs_disabled_warnings': [4244, 4267, 4341, 4345, 4390, 4554, 4748, 4800], | 218 'msvs_disabled_warnings': [4244, 4267, 4341, 4345, 4390, 4554, 4748, 4800], |
| 221 } | 219 } |
| OLD | NEW |