diff options
| author |  Mike Klein <mtklein@chromium.org> | 2017-03-08 18:54:25 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-08 18:54:42 +0000 |
| commit | 2fcd17087e4e299a734f4f41fe94cd039adc2b64 (patch) | |
| tree | 3e0ebb5c24e5b87040755b3437765c3d9148febd /gn | |
| parent | c624d9d212c4168fc6c202a8535ddff8a3bfb16a (diff) | |
Revert "Turn on SkJumper all the time."
This reverts commit 135555101cbde68656f028c41506113374a4026f.
Reason for revert: forgot g3, seems to break Chrome NaCl builders?
https://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20Win/builds/15969/steps/compile/logs/stdio
Original change's description:
> Turn on SkJumper all the time.
>
> If the previous CL sticks, it's now easy to turn on SkJumper everywhere:
> I was mostly holding back because of build system complexity.
>
> This has the main effect of turning on SkJumper in Chromium.
> It's already been on on our local test bots and on Android framework.
>
> Change-Id: I7fbfc6aaaa7dace9c3f2cb509583c69b10997dbf
> Reviewed-on: https://skia-review.googlesource.com/9380
> Reviewed-by: Mike Klein <mtklein@chromium.org>
> Commit-Queue: Mike Klein <mtklein@chromium.org>
>
TBR=mtklein@chromium.org,herb@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I69747e9e75b2a8e3d78f6c150c9b6d6453e00632
Reviewed-on: https://skia-review.googlesource.com/9444
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'gn')
| -rw-r--r-- | gn/core.gni | 4 | ||||
| -rw-r--r-- | gn/gn_to_bp.py | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/gn/core.gni b/gn/core.gni index 56dd13feeb..3b71c45f49 100644 --- a/gn/core.gni +++ b/gn/core.gni @@ -381,10 +381,6 @@ skia_core_sources = [ # "$_src/image/SkSurface_Gpu.cpp", "$_src/image/SkSurface_Raster.cpp", - "$_src/jumper/SkJumper.cpp", - "$_src/jumper/SkJumper_generated.cpp", - "$_src/jumper/SkJumper_stages.cpp", - "$_src/pipe/SkPipeCanvas.cpp", "$_src/pipe/SkPipeReader.cpp", diff --git a/gn/gn_to_bp.py b/gn/gn_to_bp.py index c8c7079a89..487bdffd1e 100644 --- a/gn/gn_to_bp.py +++ b/gn/gn_to_bp.py @@ -192,6 +192,7 @@ cc_test { # We'll run GN to get the main source lists and include directories for Skia. gn_args = { 'is_official_build': 'true', + 'skia_enable_jumper': 'true', 'skia_enable_tools': 'true', 'skia_use_vulkan': 'true', 'target_cpu': '"none"', |