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

Unified Diff: gyp/codec.gyp

Issue 1653543002: Revert of Treat bad values passed to --images as a fatal error (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 11 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 | « dm/DM.cpp ('k') | gyp/common_conditions.gypi » ('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 0f49ee4c441a6a61675bd57d3e1d0ca3e9e742b4..eb87de1faa04e4bfd660cdd26de7a091830e60c2 100644
--- a/gyp/codec.gyp
+++ b/gyp/codec.gyp
@@ -67,7 +67,8 @@
'TURBO_HAS_SKIP',
],
'conditions': [
- ['skia_codec_decodes_raw', {
+ # FIXME: fix the support for ChromeOS [DNG SDK issue with clock_gettime()].
+ ['skia_codec_decodes_raw and skia_os != "chromeos"', {
'dependencies': [
'raw_codec',
],
@@ -75,7 +76,7 @@
],
}, {
# RAW codec needs exceptions. Due to that, it is a separate target. Its usage can be
- # controlled by skia_codec_decodes_raw flag.
+ # controlled by SK_CODEC_DECODES_RAW flag.
'target_name': 'raw_codec',
'product_name': 'raw_codec',
'type': 'static_library',
@@ -109,7 +110,13 @@
'include_dirs': [
'../include/codec',
],
+ 'defines': [
+ 'SK_CODEC_DECODES_RAW',
+ ],
},
+ 'defines': [
+ 'SK_CODEC_DECODES_RAW',
+ ],
'conditions': [
['skia_arch_type == "x86" or skia_arch_type == "arm"', {
'defines': [
« no previous file with comments | « dm/DM.cpp ('k') | gyp/common_conditions.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698