Revert "make SkJumper stages normal Skia code"

This reverts commit 22e536e3a1a09405d1c0e6f071717a726d86e8d4.

Reason for revert: wrong include path :/

Original change's description:
> make SkJumper stages normal Skia code
> 
> Enough clients are using Clang now that we can say, use Clang to build
> if you want these software pipeline stages to go fast.
> 
> This lets us drop the offline build aspect of SkJumper stages, instead
> building as part of Skia using the SkOpts framework.
> 
> I think everything should work, except I've (temporarily) removed
> AVX-512 support.  I will put this back in a follow up.
> 
> I have had to drop Windows down to __vectorcall and our narrower
> stage calling convention that keeps the d-registers on the stack.
> I tried forcing sysv_abi, but that crashed Clang.  :/
> 
> Added a TODO to up the same narrower stage calling convention
> for lowp stages... we just *don't* today, for no good reason.
> 
> Change-Id: Iaaa792ffe4deab3508d2dc5d0008c163c24b3383
> Reviewed-on: https://skia-review.googlesource.com/110641
> Commit-Queue: Mike Klein <mtklein@chromium.org>
> Reviewed-by: Herb Derby <herb@google.com>
> Reviewed-by: Florin Malita <fmalita@chromium.org>

TBR=mtklein@chromium.org,herb@google.com,fmalita@chromium.org

Change-Id: I2bdc709c80cdfa6b13ff24e024b3721bef887f46
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/112741
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>

4 files changed, 19 insertions, 7 deletions

diff --git a/gn/core.gni b/gn/core.gni
index 12a74ae93b..bcec7c02f0 100644
--- a/gn/core.gni
+++ b/gn/core.gni
@@ -440,8 +440,6 @@ skia_core_sources = [
   "$_include/core/SkUnPreMultiply.h",
   "$_include/core/SkVertices.h",
 
-  "$_src/jumper/SkJumper.cpp",
-
   # private
   "$_include/private/SkAtomics.h",
   "$_include/private/SkChecksum.h",
@@ -529,4 +527,20 @@ skia_core_sources = [
   "$_src/pathops/SkReduceOrder.h",
 ]
 
-skia_core_defines = []  #  Used to be used by Chromium, but no longer.
+skia_core_sources += [
+  "$_src/jumper/SkJumper.cpp",
+  "$_src/jumper/SkJumper_stages.cpp",
+  "$_src/jumper/SkJumper_stages_lowp.cpp",
+]
+skia_core_defines = []
+if (is_win) {
+  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 if (target_cpu != "wasm") {
+  skia_core_sources += [ "$_src/jumper/SkJumper_generated.S" ]
+}
diff --git a/gn/gn_to_bp.py b/gn/gn_to_bp.py
index 4c8cba75d5..0dfada3ea2 100644
--- a/gn/gn_to_bp.py
+++ b/gn/gn_to_bp.py
@@ -289,8 +289,7 @@ with open('Android.bp', 'w') as f:
                                defs['ssse3'] +
                                defs['sse41'] +
                                defs['sse42'] +
-                               defs['avx'  ] +
-                               defs['hsw'  ]),
+                               defs['avx'  ]),
 
     'dm_includes'       : bpfmt(8, dm_includes),
     'dm_srcs'           : bpfmt(8, dm_srcs),
diff --git a/gn/opts.gni b/gn/opts.gni
index 34481db3b6..1cc6027af2 100644
--- a/gn/opts.gni
+++ b/gn/opts.gni
@@ -51,4 +51,3 @@ ssse3 = [
 sse41 = [ "$_src/opts/SkOpts_sse41.cpp" ]
 sse42 = [ "$_src/opts/SkOpts_sse42.cpp" ]
 avx = [ "$_src/opts/SkOpts_avx.cpp" ]
-hsw = [ "$_src/opts/SkOpts_hsw.cpp" ]
diff --git a/gn/shared_sources.gni b/gn/shared_sources.gni
index 6df999921a..29cac671a4 100644
--- a/gn/shared_sources.gni
+++ b/gn/shared_sources.gni
@@ -24,7 +24,7 @@ skia_opts = {
   sse41_sources = sse41
   sse42_sources = sse42
   avx_sources = avx
-  hsw_sources = hsw
+  hsw_sources = []  # remove after we update Chrome
 }
 
 # Skia Chromium defines. These flags will be defined in chromium If these