diff options
| author | Mike Klein <mtklein@google.com> | 2018-11-08 12:08:05 +0000 |
|---|---|---|
| committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-11-08 14:26:52 +0000 |
| commit | 54378230f89f15c33c46e735878b099d1b468f5f (patch) | |
| tree | b6b2464e83122fd1d95ccbaad6061a882f2219d1 /experimental | |
| parent | 5d58d09ae77d43b38c313b627bddda3ae944e830 (diff) | |
| download | skqp-54378230f89f15c33c46e735878b099d1b468f5f.tar.gz | |
Reland "simplify disabling effect deserialization"
This reverts commit 34d7a163a4a749d6e91cf768d0f1767e8da6ceb2.
Reason for revert: ok now?
Original change's description:
> Revert "simplify disabling effect deserialization"
>
> This reverts commit 5bbf790b5beeb2ed74f04551502259b54ac5556f.
>
> Reason for revert: flutter GN needs some love
>
> Original change's description:
> > simplify disabling effect deserialization
> >
> > Switch to a simple #define instead of conditional build targets.
> >
> > No one changes skia_enable_effects or skia_enable_effects_imagefilters,
> > so we can merge all that together back into :skia.
> >
> > Change-Id: I2985f95ee89149ddc687dc31f4c6bf35cb3a93c7
> > Reviewed-on: https://skia-review.googlesource.com/c/169220
> > Reviewed-by: Kevin Lubick <kjlubick@google.com>
> > Commit-Queue: Mike Klein <mtklein@google.com>
>
> TBR=mtklein@google.com,kjlubick@google.com
>
> Change-Id: I3b818418d303dbc6d2a926a19df64a68499f0ec3
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Reviewed-on: https://skia-review.googlesource.com/c/169222
> Reviewed-by: Mike Klein <mtklein@google.com>
> Commit-Queue: Mike Klein <mtklein@google.com>
TBR=mtklein@google.com,kjlubick@google.com
Cq-Include-Trybots: skia.primary:Build-Debian9-Clang-arm-Release-Flutter_Android
Change-Id: I534346c3ef3561a871f1af6df976bfee0b48014a
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/169640
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Diffstat (limited to 'experimental')
| -rwxr-xr-x | experimental/canvaskit/compile.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/experimental/canvaskit/compile.sh b/experimental/canvaskit/compile.sh index b7a8653de1..5979f9846f 100755 --- a/experimental/canvaskit/compile.sh +++ b/experimental/canvaskit/compile.sh @@ -101,6 +101,7 @@ echo "Compiling bitcode" extra_cflags_cc=[\"-frtti\"] \ extra_cflags=[\"-s\",\"USE_FREETYPE=1\",\"-s\",\"USE_LIBPNG=1\", \"-s\", \"WARN_UNALIGNED=1\", \"-DSKNX_NO_SIMD\", \"-DSK_DISABLE_AAA\", \"-DSK_DISABLE_DAA\", \"-DSK_DISABLE_READBUFFER\", + \"-DSK_DISABLE_EFFECT_DESERIALIZATION\", ${GN_GPU_FLAGS} ${EXTRA_CFLAGS} ] \ @@ -130,7 +131,6 @@ echo "Compiling bitcode" skia_enable_nvpr=false \ skia_enable_skpicture=false \ ${GN_NIMA} \ - skia_enable_effect_deserialization = false \ ${GN_GPU} \ skia_enable_fontmgr_empty=false \ skia_enable_pdf=false" |