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

Unified Diff: gyp/codec.gyp

Issue 1702533004: Individually enable and disable SkCodecs (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Only keep the ifdefs that we really need 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
Index: gyp/codec.gyp
diff --git a/gyp/codec.gyp b/gyp/codec.gyp
index 9537f8aa51c3406f9f41f98a35283646a6e28918..e9bec29dae54640c3aeeb882aed94600437f763b 100644
--- a/gyp/codec.gyp
+++ b/gyp/codec.gyp
@@ -22,11 +22,6 @@
'libpng.gyp:libpng',
'libwebp.gyp:libwebp',
],
- 'cflags':[
- # FIXME: This gets around a longjmp warning. See
scroggo 2016/02/17 14:55:55 Did this get fixed in this patch? Or maybe it was
msarett 2016/02/17 15:13:47 I *think* this was fixed before and we didn't noti
- # http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-x86_64-Release-Trybot/builds/113/steps/build%20most/logs/stdio
- '-Wno-clobbered -Wno-error',
- ],
'include_dirs': [
'../include/codec',
'../include/private',
@@ -65,6 +60,15 @@
],
},
'defines': [
+ # Allow the client to turn on/off individual codecs. This can be useful
scroggo 2016/02/17 14:55:55 Is the idea that a client would modify this file i
mtklein 2016/02/17 14:59:30 Let's not add switches no one's asking to flip yet
msarett 2016/02/17 15:13:47 Let's leave as is for now - if we find we need swi
scroggo 2016/02/17 15:20:00 Yes :)
msarett 2016/02/17 15:26:28 Improved this comment.
+ # when some of the dependencies are not present.
+ 'SK_CODEC_DECODES_GIF',
+ 'SK_CODEC_DECODES_JPEG',
+ 'SK_CODEC_DECODES_PNG',
+ 'SK_CODEC_DECODES_WEBP',
+
+ # Turn on optimizations when the appropriate version of libjpeg-turbo is
+ # present.
'TURBO_HAS_SKIP',
'TURBO_HAS_565',
],
« no previous file with comments | « cmake/CMakeLists.txt ('k') | public.bzl » ('j') | src/codec/SkAndroidCodec.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698