diff options
| author |  msarett <msarett@google.com> | 2016-02-12 12:35:48 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-02-12 12:35:49 -0800 |
| commit | 70e418b468b1656feae3e84851562b22e5d25660 (patch) | |
| tree | 38b88d69c7c3c1f0a0fb223b3ab902af67221c09 /public.bzl | |
| parent | e6af96a88901b3c6f0c27575197a93db6cb04042 (diff) | |
Make SkJpegCodec compatible with libjpeg
BUG=skia:4470
BUG=skia:4520
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1687863003
Review URL: https://codereview.chromium.org/1687863003
Diffstat (limited to 'public.bzl')
| -rw-r--r-- | public.bzl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/public.bzl b/public.bzl index 0b2fbae900..32cb2de786 100644 --- a/public.bzl +++ b/public.bzl @@ -129,7 +129,6 @@ BASE_SRCS_UNIX = struct( "src/ports/**/*.h", ], exclude = [ - "src/codec/SkJpegCodec.cpp", # libjpeg_turbo version mismatch. "src/opts/*arm*", "src/opts/*mips*", "src/opts/*NEON*", @@ -178,7 +177,6 @@ BASE_SRCS_ANDROID = struct( "src/ports/**/*.h", ], exclude = [ - "src/codec/SkJpegCodec.cpp", # libjpeg_turbo version mismatch. "src/opts/*mips*", "src/opts/*SSE2*", "src/opts/*SSSE3*", @@ -477,6 +475,7 @@ COPTS_ALL = [] ################################################################################ DEFINES_UNIX = [ + "PNG_SKIP_SETJMP_CHECK", "SK_BUILD_FOR_UNIX", "SK_SAMPLES_FOR_X", "SK_SFNTLY_SUBSETTER", |