aboutsummaryrefslogtreecommitdiffhomepage
path: root/BUILD.gn
diff options
context:
space:
mode:
authorGravatar Mike Klein <mtklein@chromium.org>2017-03-29 16:33:06 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-03-29 21:22:11 +0000
commitd7e06aec7e7837ca1dd54680ad37b431e40e4eef (patch)
treeffe17ff5709c7acb4759c3b131de35a2096ea5f6 /BUILD.gn
parent291932e8e42e0556bfef9118231b4ac364ecf5df (diff)
jumper, revert to generating .S files
I went with the unified-in-one-.cpp approach mostly to make it easy to roll out SkJumper. I no longer see any difficultly rolling out the assembly files, and it's possible the unified .cpp approach just makes things harder. Let's see if it's any easier to get Chrome's official build to work with normal assembly files. It's not going to be a problem to roll out. This is a partial revert of https://skia-review.googlesource.com/c/9336. CQ_INCLUDE_TRYBOTS=skia.primary:Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug,Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug,Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug,Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug Change-Id: Idfdbd2d322452b44bc0adaf6dc299cc7649bc51e Reviewed-on: https://skia-review.googlesource.com/10561 Reviewed-by: Herb Derby <herb@google.com> Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'BUILD.gn')
-rw-r--r--BUILD.gn6
1 files changed, 5 insertions, 1 deletions
diff --git a/BUILD.gn b/BUILD.gn
index 3364148350..88ec34fb0c 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -518,9 +518,13 @@ optional("jumper") {
public_defines = [ "SK_JUMPER" ]
sources = [
"src/jumper/SkJumper.cpp",
- "src/jumper/SkJumper_generated.cpp",
"src/jumper/SkJumper_stages.cpp",
]
+ if (is_win && target_cpu == "x64") {
+ sources += [ "src/jumper/SkJumper_generated_win.S" ]
+ } else if (!is_win) {
+ sources += [ "src/jumper/SkJumper_generated.S" ]
+ }
}
optional("typeface_freetype") {