diff options
| author |  Mike Klein <mtklein@chromium.org> | 2017-09-21 16:10:58 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-09-21 20:31:06 +0000 |
| commit | 85463e6ec45f29aa4b8f37b6094d3525248101d7 (patch) | |
| tree | 6e0df1c1572480a19a8548231671765b29c65e66 /gn/core.gni | |
| parent | 9d5f1c5ce094cbcde526d61365b2f8d5c7766bd6 (diff) | |
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>
Diffstat (limited to 'gn/core.gni')
| -rw-r--r-- | gn/core.gni | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gn/core.gni b/gn/core.gni index 79498b460b..1415b5f6dc 100644 --- a/gn/core.gni +++ b/gn/core.gni @@ -530,7 +530,6 @@ if (is_win) { # 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" ] } |