Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2768)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: public.bzl

Issue 1687863003: Make SkJpegCodec compatible with libjpeg (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Response to comments 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gyp/codec.gyp ('k') | src/codec/SkCodec.cpp » ('j') | src/codec/SkJpegCodec.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: public.bzl
diff --git a/public.bzl b/public.bzl
index 8bf328dd4c0480266feb30ebd4f9e82ffa657151..98f6ef6c0b10382e2b620b64c983c2e749be529c 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.
# TODO(benjaminwagner): Can this be enabled?
"src/codec/SkRaw*",
"src/opts/*arm*",
@@ -180,7 +179,6 @@ 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*",
@@ -481,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') | src/codec/SkJpegCodec.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698