public.bzl - Issue 1687863003: Make SkJpegCodec compatible with libjpeg

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: public.bzl

Issue 1687863003: Make SkJpegCodec compatible with libjpeg (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Rebase Created 4 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: public.bzl

diff --git a/public.bzl b/public.bzl

index 0b2fbae9007ed6f2bfb6d9b1b8f7901cabaa36ae..9055cc57d1bbcb1ce6fed553c819ecf961f6b4d8 100644

--- a/public.bzl

+++ b/public.bzl

@@ -129,7 +129,8 @@ BASE_SRCS_UNIX = struct(

"src/ports/**/*.h",

exclude = [

- "src/codec/SkJpegCodec.cpp", # libjpeg_turbo version mismatch.

+ # TODO(benjaminwagner): Can this be enabled?

dogben 2016/02/12 20:00:13 Please don't re-add. See https://codereview.chromi

msarett 2016/02/12 20:01:25 Uggh. Sorry my mistake.

+ "src/codec/SkRaw*",

"src/opts/*arm*",

"src/opts/*mips*",

"src/opts/*NEON*",

@@ -178,7 +179,8 @@ BASE_SRCS_ANDROID = struct(

"src/ports/**/*.h",

exclude = [

- "src/codec/SkJpegCodec.cpp", # libjpeg_turbo version mismatch.

+ # TODO(benjaminwagner): Can this be enabled?

+ "src/codec/SkRaw*",

"src/opts/*mips*",

"src/opts/*SSE2*",

"src/opts/*SSSE3*",

@@ -477,6 +479,7 @@ COPTS_ALL = []

################################################################################

DEFINES_UNIX = [

+ "PNG_SKIP_SETJMP_CHECK",

"SK_BUILD_FOR_UNIX",

"SK_SAMPLES_FOR_X",

"SK_SFNTLY_SUBSETTER",

« no previous file with comments | « gyp/codec.gyp ('k') | src/codec/SkCodec.cpp » ('j') | no next file with comments »