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

Side by Side Diff: tools/gn/secondary/skia/BUILD.gn

Issue 156563002: Redefine is_linux to not include Android in the GN build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « tools/gn/secondary/chrome/BUILD.gn ('k') | tools/gn/secondary/third_party/libxml/BUILD.gn » ('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 (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 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 enable_printing = true # TODO(brettw) pass this feature flag in somehow. 5 enable_printing = true # TODO(brettw) pass this feature flag in somehow.
6 skia_support_gpu = !is_ios 6 skia_support_gpu = !is_ios
7 skia_support_pdf = !is_ios && enable_printing 7 skia_support_pdf = !is_ios && enable_printing
8 8
9 # External-facing config for dependent code. 9 # External-facing config for dependent code.
10 config("skia_config") { 10 config("skia_config") {
(...skipping 1220 matching lines...) Expand 10 before | Expand all | Expand 10 after
1231 ] 1231 ]
1232 } 1232 }
1233 1233
1234 if (skia_support_pdf) { 1234 if (skia_support_pdf) {
1235 deps += [ "//third_party/sfntly" ] 1235 deps += [ "//third_party/sfntly" ]
1236 } 1236 }
1237 } 1237 }
1238 } 1238 }
1239 1239
1240 1240
1241 if (is_linux && !is_android) { 1241 if (is_linux && (cpu_arch == "x86" || cpu_arch == "x64")) {
1242 # TODO(brettw) && arch != "arm" && arch != "mipsel"
1243 sse_cflags = [ "-msse2" ] 1242 sse_cflags = [ "-msse2" ]
1244 } else { 1243 } else {
1245 sse_cflags = [] 1244 sse_cflags = []
1246 } 1245 }
1247 1246
1248 1247
1249 static_library("skia_chrome_opts") { 1248 static_library("skia_chrome_opts") {
1250 sources = [ 1249 sources = [
1251 "ext/convolver_SSE2.cc", 1250 "ext/convolver_SSE2.cc",
1252 ] 1251 ]
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
1301 ":skia_config", 1300 ":skia_config",
1302 "//build/config/compiler:no_chromium_code" 1301 "//build/config/compiler:no_chromium_code"
1303 ] 1302 ]
1304 1303
1305 if (is_linux) { 1304 if (is_linux) {
1306 cflags = [ "-msse3" ] 1305 cflags = [ "-msse3" ]
1307 } else if (is_mac) { 1306 } else if (is_mac) {
1308 cflags = [ "-mssse3" ] # Note the third 's'. 1307 cflags = [ "-mssse3" ] # Note the third 's'.
1309 } 1308 }
1310 } 1309 }
OLDNEW
« no previous file with comments | « tools/gn/secondary/chrome/BUILD.gn ('k') | tools/gn/secondary/third_party/libxml/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698