Chromium Code Reviews| OLD | NEW |
|---|---|
| 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") { | 8 if (current_cpu == "arm") { |
| 9 import("//build/config/arm.gni") | 9 import("//build/config/arm.gni") |
| 10 } | 10 } |
| 11 if (current_cpu == "mipsel" || current_cpu == "mipsel64") { | |
| 12 import("//build/config/mips.gni") | |
| 13 } | |
| 11 | 14 |
| 12 skia_support_gpu = !is_ios | 15 skia_support_gpu = !is_ios |
| 13 skia_support_pdf = !is_ios && (enable_basic_printing || enable_print_preview) | 16 skia_support_pdf = !is_ios && (enable_basic_printing || enable_print_preview) |
| 14 | 17 |
| 15 # The list of Skia defines that are to be set for blink. | 18 # The list of Skia defines that are to be set for blink. |
| 16 gypi_blink_skia_defines = | 19 gypi_blink_skia_defines = |
| 17 exec_script("//build/gypi_to_gn.py", | 20 exec_script("//build/gypi_to_gn.py", |
| 18 [ | 21 [ |
| 19 rebase_path( | 22 rebase_path( |
| 20 "//third_party/WebKit/public/blink_skia_config.gypi"), | 23 "//third_party/WebKit/public/blink_skia_config.gypi"), |
| (...skipping 522 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 543 source_set("skia_opts") { | 546 source_set("skia_opts") { |
| 544 cflags = [] | 547 cflags = [] |
| 545 defines = [] | 548 defines = [] |
| 546 | 549 |
| 547 if (current_cpu == "x86" || current_cpu == "x64") { | 550 if (current_cpu == "x86" || current_cpu == "x64") { |
| 548 sources = gypi_skia_opts.sse2_sources + gypi_skia_opts.ssse3_sources + | 551 sources = gypi_skia_opts.sse2_sources + gypi_skia_opts.ssse3_sources + |
| 549 gypi_skia_opts.sse41_sources + | 552 gypi_skia_opts.sse41_sources + |
| 550 [ | 553 [ |
| 551 # Chrome-specific. | 554 # Chrome-specific. |
| 552 "ext/convolver_SSE2.cc", | 555 "ext/convolver_SSE2.cc", |
| 556 "ext/convolver_SSE2.h", | |
| 553 ] | 557 ] |
| 554 | 558 |
| 555 if (is_linux || is_mac) { | 559 if (is_linux || is_mac) { |
| 556 cflags += [ "-msse4.1" ] | 560 cflags += [ "-msse4.1" ] |
| 557 } | 561 } |
| 558 } else if (current_cpu == "arm") { | 562 } else if (current_cpu == "arm") { |
| 559 # The assembly uses the frame pointer register (r7 in Thumb/r11 in | 563 # The assembly uses the frame pointer register (r7 in Thumb/r11 in |
| 560 # ARM), the compiler doesn't like that. | 564 # ARM), the compiler doesn't like that. |
| 561 cflags += [ "-fomit-frame-pointer" ] | 565 cflags += [ "-fomit-frame-pointer" ] |
| 562 | 566 |
| 563 if (arm_version >= 7) { | 567 if (arm_version >= 7) { |
| 564 sources = gypi_skia_opts.armv7_sources | 568 sources = gypi_skia_opts.armv7_sources |
| 565 if (arm_use_neon || arm_optionally_use_neon) { | 569 if (arm_use_neon || arm_optionally_use_neon) { |
| 566 sources += gypi_skia_opts.neon_sources | 570 sources += gypi_skia_opts.neon_sources |
| 567 | 571 |
| 568 # Root build config sets -mfpu=$arm_fpu, which we expect to be neon | 572 # Root build config sets -mfpu=$arm_fpu, which we expect to be neon |
| 569 # when running this. | 573 # when running this. |
| 570 if (!arm_use_neon) { | 574 if (!arm_use_neon) { |
| 571 configs -= [ "//build/config/compiler:compiler_arm_fpu" ] | 575 configs -= [ "//build/config/compiler:compiler_arm_fpu" ] |
| 572 cflags += [ "-mfpu=neon" ] | 576 cflags += [ "-mfpu=neon" ] |
| 573 } | 577 } |
| 574 } | 578 } |
| 575 } else { | 579 } else { |
| 576 sources = gypi_skia_opts.none_sourcees | 580 sources = gypi_skia_opts.none_sourcees |
| 577 } | 581 } |
| 578 } else if (current_cpu == "mipsel") { | 582 } else if (current_cpu == "mipsel") { |
| 579 cflags += [ "-fomit-frame-pointer" ] | 583 cflags += [ "-fomit-frame-pointer" ] |
| 580 sources = gypi_skia_opts.none_sources | 584 |
| 585 if (mips_dsp_rev >= 1) { | |
| 586 sources = gypi_skia_opts.mips_dsp_sources | |
| 587 if (mips_dsp_rev >= 2) { | |
| 588 sources += [ | |
| 589 # Chrome-specific. | |
| 590 "ext/convolver_mips_dspr2.cc", | |
| 591 "ext/convolver_mips_dspr2.h", | |
| 592 ] | |
| 593 } | |
| 594 } else { | |
| 595 sources = gypi_skia_opts.none_sources | |
| 596 } | |
|
wtc
2015/03/12 22:03:20
The new code I added mimics the code for SSE2 and
| |
| 581 } else { | 597 } else { |
| 582 assert(false, "Need to port cpu specific stuff from skia_library_opts.gyp") | 598 assert(false, "Need to port cpu specific stuff from skia_library_opts.gyp") |
| 583 } | 599 } |
| 584 | 600 |
| 585 if (is_android && !is_debug) { | 601 if (is_android && !is_debug) { |
| 586 configs -= [ "//build/config/compiler:optimize" ] | 602 configs -= [ "//build/config/compiler:optimize" ] |
| 587 configs += [ "//build/config/compiler:optimize_max" ] | 603 configs += [ "//build/config/compiler:optimize_max" ] |
| 588 } | 604 } |
| 589 | 605 |
| 590 configs -= [ "//build/config/compiler:chromium_code" ] | 606 configs -= [ "//build/config/compiler:chromium_code" ] |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 647 sources = [ | 663 sources = [ |
| 648 "tools/filter_fuzz_stub/filter_fuzz_stub.cc", | 664 "tools/filter_fuzz_stub/filter_fuzz_stub.cc", |
| 649 ] | 665 ] |
| 650 | 666 |
| 651 deps = [ | 667 deps = [ |
| 652 ":skia", | 668 ":skia", |
| 653 "//base", | 669 "//base", |
| 654 ] | 670 ] |
| 655 } | 671 } |
| 656 } | 672 } |
| OLD | NEW |