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

Side by Side Diff: skia/BUILD.gn

Issue 1513373005: Skia version roll to a1bb8e02fe7956b2f85a0afadbca5f607a804403 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Include avx sources only -- sse42 does not need to be included Created 5 years 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 | « DEPS ('k') | no next file » | 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 import("//build/config/features.gni") 5 import("//build/config/features.gni")
6 import("//build/config/ui.gni") 6 import("//build/config/ui.gni")
7 import("//testing/test.gni") 7 import("//testing/test.gni")
8 if (current_cpu == "arm" || current_cpu == "arm64") { 8 if (current_cpu == "arm" || current_cpu == "arm64") {
9 import("//build/config/arm.gni") 9 import("//build/config/arm.gni")
10 } 10 }
(...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after
463 } 463 }
464 } 464 }
465 465
466 # Separated out so it can be compiled with different flags for SSE. 466 # Separated out so it can be compiled with different flags for SSE.
467 source_set("skia_opts") { 467 source_set("skia_opts") {
468 cflags = [] 468 cflags = []
469 defines = [] 469 defines = []
470 470
471 if (current_cpu == "x86" || current_cpu == "x64") { 471 if (current_cpu == "x86" || current_cpu == "x64") {
472 sources = gypi_skia_opts.sse2_sources + gypi_skia_opts.ssse3_sources + 472 sources = gypi_skia_opts.sse2_sources + gypi_skia_opts.ssse3_sources +
473 gypi_skia_opts.sse41_sources 473 gypi_skia_opts.sse41_sources + gypi_skia_opts.avx_sources
474 if (is_linux || is_mac) { 474 if (is_linux || is_mac) {
475 cflags += [ "-msse4.1" ] 475 cflags += [ "-msse4.1" ]
476 } 476 }
477 } else if (current_cpu == "arm") { 477 } else if (current_cpu == "arm") {
478 # The assembly uses the frame pointer register (r7 in Thumb/r11 in 478 # The assembly uses the frame pointer register (r7 in Thumb/r11 in
479 # ARM), the compiler doesn't like that. 479 # ARM), the compiler doesn't like that.
480 cflags += [ "-fomit-frame-pointer" ] 480 cflags += [ "-fomit-frame-pointer" ]
481 if (arm_version >= 7 && (arm_use_neon || arm_optionally_use_neon)) { 481 if (arm_version >= 7 && (arm_use_neon || arm_optionally_use_neon)) {
482 sources = gypi_skia_opts.armv7_sources 482 sources = gypi_skia_opts.armv7_sources
483 if (arm_use_neon || arm_optionally_use_neon) { 483 if (arm_use_neon || arm_optionally_use_neon) {
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 deps = [ 539 deps = [
540 ":skia", 540 ":skia",
541 "//base", 541 "//base",
542 "//base/test:run_all_unittests", 542 "//base/test:run_all_unittests",
543 "//cc:test_support", # TODO: Fix this test to not depend on cc. 543 "//cc:test_support", # TODO: Fix this test to not depend on cc.
544 "//testing/gtest", 544 "//testing/gtest",
545 "//ui/gfx", 545 "//ui/gfx",
546 "//ui/gfx/geometry", 546 "//ui/gfx/geometry",
547 ] 547 ]
548 } 548 }
OLDNEW
« no previous file with comments | « DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698