commit 85463e6ec45f29aa4b8f37b6094d3525248101d7
author Mike Klein <mtklein@chromium.org> Thu Sep 21 16:10:58 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Sep 21 20:31:06 2017 +0000
tree 6e0df1c1572480a19a8548231671765b29c65e66
parent 9d5f1c5ce094cbcde526d61365b2f8d5c7766bd6

Fix Android roll.

The GN->Android.bp script runs with target_cpu="none",
but Android needs SkJumper_generated.S.  Just skip it
explicitly for WASM.

Change-Id: I07b9761c591d48198460ce6300ed3bc9fd02a487
Reviewed-on: https://skia-review.googlesource.com/49903
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>

gn/core.gni

diff --git a/gn/core.gni b/gn/core.gni
index 79498b4..1415b5f 100644
--- a/gn/core.gni
+++ b/gn/core.gni
@@ -530,7 +530,6 @@
     # assembler situation is figured out, https://crbug.com/762167
     skia_core_defines += [ "SK_JUMPER_USE_ASSEMBLY=0" ]
   }
-} else if (target_cpu == "arm" || target_cpu == "arm64" ||
-           target_cpu == "x86" || target_cpu == "x64") {
+} else if (target_cpu != "wasm") {
   skia_core_sources += [ "$_src/jumper/SkJumper_generated.S" ]
 }