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

Side by Side 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, 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 unified diff | Download patch
« no previous file with comments | « dm/DM.cpp ('k') | gyp/common_conditions.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2015 Google Inc. 1 # Copyright 2015 Google Inc.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 # Copyright 2015 Google Inc. 5 # Copyright 2015 Google Inc.
6 # 6 #
7 # Use of this source code is governed by a BSD-style license that can be 7 # Use of this source code is governed by a BSD-style license that can be
8 # found in the LICENSE file. 8 # found in the LICENSE file.
9 9
10 # GYP file for codec project. 10 # GYP file for codec project.
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 ], 60 ],
61 'direct_dependent_settings': { 61 'direct_dependent_settings': {
62 'include_dirs': [ 62 'include_dirs': [
63 '../include/codec', 63 '../include/codec',
64 ], 64 ],
65 }, 65 },
66 'defines': [ 66 'defines': [
67 'TURBO_HAS_SKIP', 67 'TURBO_HAS_SKIP',
68 ], 68 ],
69 'conditions': [ 69 'conditions': [
70 ['skia_codec_decodes_raw', { 70 # FIXME: fix the support for ChromeOS [DNG SDK issue with clock_gettime( )].
71 ['skia_codec_decodes_raw and skia_os != "chromeos"', {
71 'dependencies': [ 72 'dependencies': [
72 'raw_codec', 73 'raw_codec',
73 ], 74 ],
74 },], 75 },],
75 ], 76 ],
76 }, { 77 }, {
77 # RAW codec needs exceptions. Due to that, it is a separate target. Its us age can be 78 # RAW codec needs exceptions. Due to that, it is a separate target. Its us age can be
78 # controlled by skia_codec_decodes_raw flag. 79 # controlled by SK_CODEC_DECODES_RAW flag.
79 'target_name': 'raw_codec', 80 'target_name': 'raw_codec',
80 'product_name': 'raw_codec', 81 'product_name': 'raw_codec',
81 'type': 'static_library', 82 'type': 'static_library',
82 'dependencies': [ 83 'dependencies': [
83 'core.gyp:*', 84 'core.gyp:*',
84 'dng_sdk.gyp:dng_sdk-selector', 85 'dng_sdk.gyp:dng_sdk-selector',
85 'libjpeg-turbo-selector.gyp:libjpeg-turbo-selector', 86 'libjpeg-turbo-selector.gyp:libjpeg-turbo-selector',
86 'piex.gyp:piex-selector', 87 'piex.gyp:piex-selector',
87 ], 88 ],
88 'cflags':[ 89 'cflags':[
(...skipping 13 matching lines...) Expand all
102 '../src/core', 103 '../src/core',
103 ], 104 ],
104 'sources': [ 105 'sources': [
105 '../src/codec/SkRawAdapterCodec.cpp', 106 '../src/codec/SkRawAdapterCodec.cpp',
106 '../src/codec/SkRawCodec.cpp', 107 '../src/codec/SkRawCodec.cpp',
107 ], 108 ],
108 'direct_dependent_settings': { 109 'direct_dependent_settings': {
109 'include_dirs': [ 110 'include_dirs': [
110 '../include/codec', 111 '../include/codec',
111 ], 112 ],
113 'defines': [
114 'SK_CODEC_DECODES_RAW',
115 ],
112 }, 116 },
117 'defines': [
118 'SK_CODEC_DECODES_RAW',
119 ],
113 'conditions': [ 120 'conditions': [
114 ['skia_arch_type == "x86" or skia_arch_type == "arm"', { 121 ['skia_arch_type == "x86" or skia_arch_type == "arm"', {
115 'defines': [ 122 'defines': [
116 'qDNGBigEndian=0', 123 'qDNGBigEndian=0',
117 ], 124 ],
118 }], 125 }],
119 ['skia_os == "ios" or skia_os == "mac"', { 126 ['skia_os == "ios" or skia_os == "mac"', {
120 'xcode_settings': { 127 'xcode_settings': {
121 'OTHER_CFLAGS': ['-fexceptions'], 128 'OTHER_CFLAGS': ['-fexceptions'],
122 'OTHER_CPLUSPLUSFLAGS': ['-fexceptions'], 129 'OTHER_CPLUSPLUSFLAGS': ['-fexceptions'],
123 }, 130 },
124 }], 131 }],
125 ], 132 ],
126 }, 133 },
127 ], 134 ],
128 } 135 }
OLDNEW
« 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