| 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 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 [ 'target_arch == "arm" and arm_version >= 7 and arm_neon == 1', { | 107 [ 'target_arch == "arm" and arm_version >= 7 and arm_neon == 1', { |
| 108 'defines': [ | 108 'defines': [ |
| 109 'SK_ARM_HAS_NEON', | 109 'SK_ARM_HAS_NEON', |
| 110 ], | 110 ], |
| 111 }], | 111 }], |
| 112 [ 'target_arch == "arm" and arm_version >= 7 and arm_neon_optional == 1', { | 112 [ 'target_arch == "arm" and arm_version >= 7 and arm_neon_optional == 1', { |
| 113 'defines': [ | 113 'defines': [ |
| 114 'SK_ARM_HAS_OPTIONAL_NEON', | 114 'SK_ARM_HAS_OPTIONAL_NEON', |
| 115 ], | 115 ], |
| 116 }], | 116 }], |
| 117 |
| 118 # Enable feedback-directed optimisation for skia when building in android. |
| 119 [ 'android_webview_build == 1', { |
| 120 'aosp_build_settings': { |
| 121 'LOCAL_FDO_SUPPORT': 'true', |
| 122 }, |
| 123 }], |
| 117 ], | 124 ], |
| 118 | 125 |
| 119 'variables': { | 126 'variables': { |
| 120 'variables': { | 127 'variables': { |
| 121 'conditions': [ | 128 'conditions': [ |
| 122 ['OS== "ios"', { | 129 ['OS== "ios"', { |
| 123 'skia_support_gpu': 0, | 130 'skia_support_gpu': 0, |
| 124 }, { | 131 }, { |
| 125 'skia_support_gpu': 1, | 132 'skia_support_gpu': 1, |
| 126 }], | 133 }], |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 205 # re-export if they include Skia headers in their public headers. | 212 # re-export if they include Skia headers in their public headers. |
| 206 'all_dependent_settings': { | 213 'all_dependent_settings': { |
| 207 'include_dirs': [ | 214 'include_dirs': [ |
| 208 '..', | 215 '..', |
| 209 'config', | 216 'config', |
| 210 ], | 217 ], |
| 211 }, | 218 }, |
| 212 | 219 |
| 213 'msvs_disabled_warnings': [4244, 4267, 4341, 4345, 4390, 4554, 4748, 4800], | 220 'msvs_disabled_warnings': [4244, 4267, 4341, 4345, 4390, 4554, 4748, 4800], |
| 214 } | 221 } |
| OLD | NEW |