Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(65)

Side by Side Diff: skia/skia_common.gypi

Issue 1048863002: Remove android_webview_build conditions from various places. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « net/net_common.gypi ('k') | third_party/sqlite/sqlite.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 # blink_skia_config.gypi defines blink_skia_defines 9 # blink_skia_config.gypi defines blink_skia_defines
10 '../third_party/WebKit/public/blink_skia_config.gypi', 10 '../third_party/WebKit/public/blink_skia_config.gypi',
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 [ 'target_arch == "arm" and arm_version >= 7 and arm_neon == 1', { 97 [ 'target_arch == "arm" and arm_version >= 7 and arm_neon == 1', {
98 'defines': [ 98 'defines': [
99 'SK_ARM_HAS_NEON', 99 'SK_ARM_HAS_NEON',
100 ], 100 ],
101 }], 101 }],
102 [ 'target_arch == "arm" and arm_version >= 7 and arm_neon_optional == 1', { 102 [ 'target_arch == "arm" and arm_version >= 7 and arm_neon_optional == 1', {
103 'defines': [ 103 'defines': [
104 'SK_ARM_HAS_OPTIONAL_NEON', 104 'SK_ARM_HAS_OPTIONAL_NEON',
105 ], 105 ],
106 }], 106 }],
107
108 # Enable feedback-directed optimisation for skia when building in android.
109 [ 'android_webview_build == 1', {
110 'aosp_build_settings': {
111 'LOCAL_FDO_SUPPORT': 'true',
112 },
113 }],
114 ], 107 ],
115 108
116 'variables': { 109 'variables': {
117 'variables': { 110 'variables': {
118 'conditions': [ 111 'conditions': [
119 ['OS== "ios"', { 112 ['OS== "ios"', {
120 'skia_support_gpu': 0, 113 'skia_support_gpu': 0,
121 }, { 114 }, {
122 'skia_support_gpu': 1, 115 'skia_support_gpu': 1,
123 }], 116 }],
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 # re-export if they include Skia headers in their public headers. 174 # re-export if they include Skia headers in their public headers.
182 'all_dependent_settings': { 175 'all_dependent_settings': {
183 'include_dirs': [ 176 'include_dirs': [
184 '..', 177 '..',
185 'config', 178 'config',
186 ], 179 ],
187 }, 180 },
188 181
189 'msvs_disabled_warnings': [4244, 4267, 4341, 4345, 4390, 4554, 4748, 4800], 182 'msvs_disabled_warnings': [4244, 4267, 4341, 4345, 4390, 4554, 4748, 4800],
190 } 183 }
OLDNEW
« no previous file with comments | « net/net_common.gypi ('k') | third_party/sqlite/sqlite.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698