diff options
| author |  Mike Klein <mtklein@chromium.org> | 2017-03-29 17:32:50 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-30 20:15:11 +0000 |
| commit | 0a64e32f3968d6f5bb514441fd1218e61ee6ba42 (patch) | |
| tree | cf6e733529aea67830b6474e8bdbdd143762e9cd /gn | |
| parent | 8feeff929e57ea63914213f3b14d8f00b287a0ad (diff) | |
Turn on SkJumper all the time, try 2.
Rebased on top of _win.S change, which I hope lands first.
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel,win_chrome_official,win_chromium_dbg_ng,win_chromium_rel_ng,win_chromium_compile_dbg_ng,win_chromium_compile_rel_ng,win_clang;master.tryserver.chromium.android:android_optional_gpu_tests_rel
Change-Id: I30e97dbb55b8a42251b46f5607096ca12bc670b9
Reviewed-on: https://skia-review.googlesource.com/10462
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Herb Derby <herb@google.com>
Diffstat (limited to 'gn')
| -rw-r--r-- | gn/core.gni | 10 | ||||
| -rw-r--r-- | gn/gn_to_bp.py | 1 |
2 files changed, 10 insertions, 1 deletions
diff --git a/gn/core.gni b/gn/core.gni index fa65f25eea..e95d22557f 100644 --- a/gn/core.gni +++ b/gn/core.gni @@ -540,3 +540,13 @@ skia_core_sources = [ "$_src/pathops/SkPathWriter.h", "$_src/pathops/SkReduceOrder.h", ] + +skia_core_sources += [ + "$_src/jumper/SkJumper.cpp", + "$_src/jumper/SkJumper_stages.cpp", +] +if (is_win) { + skia_core_sources += [ "$_src/jumper/SkJumper_generated_win.S" ] +} else { + skia_core_sources += [ "$_src/jumper/SkJumper_generated.S" ] +} diff --git a/gn/gn_to_bp.py b/gn/gn_to_bp.py index 487bdffd1e..c8c7079a89 100644 --- a/gn/gn_to_bp.py +++ b/gn/gn_to_bp.py @@ -192,7 +192,6 @@ cc_test { # We'll run GN to get the main source lists and include directories for Skia. gn_args = { 'is_official_build': 'true', - 'skia_enable_jumper': 'true', 'skia_enable_tools': 'true', 'skia_use_vulkan': 'true', 'target_cpu': '"none"', |