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

Unified Diff: gyp/codec.gyp

Issue 1702533004: Individually enable and disable SkCodecs (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 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 | « cmake/CMakeLists.txt ('k') | public.bzl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/codec.gyp
diff --git a/gyp/codec.gyp b/gyp/codec.gyp
index 9537f8aa51c3406f9f41f98a35283646a6e28918..d4904dac843ef82cfb058347d44cb9d4db47f717 100644
--- a/gyp/codec.gyp
+++ b/gyp/codec.gyp
@@ -22,10 +22,9 @@
'libpng.gyp:libpng',
'libwebp.gyp:libwebp',
],
- 'cflags':[
- # FIXME: This gets around a longjmp warning. See
- # 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',
+ 'cflags':[
+ # FIXME: This gets around a warning: "Argument might be clobbered by longjmp".
+ '-Wno-clobbered -Wno-error',
],
'include_dirs': [
'../include/codec',
@@ -65,6 +64,17 @@
],
},
'defines': [
+ # Turn on all of the codecs, since we know that we have all of the
+ # necessary dependencies. Clients that are missing some of the
+ # required decoding libraries may choose to turn the codecs on or
+ # off individually.
+ 'SK_CODEC_DECODES_GIF',
+ 'SK_CODEC_DECODES_JPEG',
+ 'SK_CODEC_DECODES_PNG',
+ 'SK_CODEC_DECODES_WEBP',
+
+ # Turn on libjpeg-turbo optimizations since we know that 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') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698