diff options
| author |  Nico Weber <thakis@chromium.org> | 2017-09-15 17:38:48 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-09-16 00:28:48 +0000 |
| commit | 6492afa7971cf295a3c3cb92a85218917c02bb4a (patch) | |
| tree | 713e3d9ab7ca9aae118f2a85520842ce6622cbcd /gn | |
| parent | d286bfbd96f8b7ccf1cbce74f07d2f3917dbec30 (diff) | |
Disable SkJumper assembly in cross builds for now.
Bug: chromium:762167
Change-Id: Ia23f6dbfc0466aef4ca9d1a5b9ff343d79dc83bb
Reviewed-on: https://skia-review.googlesource.com/47460
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'gn')
| -rw-r--r-- | gn/core.gni | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/gn/core.gni b/gn/core.gni index 748e44acc0..eb0d0d2eaf 100644 --- a/gn/core.gni +++ b/gn/core.gni @@ -521,8 +521,15 @@ skia_core_sources += [ "$_src/jumper/SkJumper_stages.cpp", "$_src/jumper/SkJumper_stages_lowp.cpp", ] +skia_core_defines = [] if (is_win) { - skia_core_sources += [ "$_src/jumper/SkJumper_generated_win.S" ] + if (host_os == "win") { + skia_core_sources += [ "$_src/jumper/SkJumper_generated_win.S" ] + } else { + # TODO(thakis): Enable jumper in linux->win cross builds once the + # assembler situation is figured out, https://crbug.com/762167 + skia_core_defines += [ "SK_JUMPER_USE_ASSEMBLY=0" ] + } } else { skia_core_sources += [ "$_src/jumper/SkJumper_generated.S" ] } |