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

Side by Side Diff: gyp/codec.gyp

Issue 1611323004: Treat bad values passed to --images as a fatal error (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Remove duplicate gyp fixes that are not needed 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
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 # FIXME: fix the support for ChromeOS [DNG SDK issue with clock_gettime( )]. 70 ['skia_codec_decodes_raw', {
scroggo 2016/01/27 19:42:27 Now this flag is only true on platforms where it's
71 ['skia_codec_decodes_raw and skia_os != "chromeos"', {
72 'dependencies': [ 71 'dependencies': [
73 'raw_codec', 72 'raw_codec',
74 ], 73 ],
75 },], 74 },],
76 ], 75 ],
77 }, { 76 }, {
78 # RAW codec needs exceptions. Due to that, it is a separate target. Its us age can be 77 # RAW codec needs exceptions. Due to that, it is a separate target. Its us age can be
79 # controlled by SK_CODEC_DECODES_RAW flag. 78 # controlled by skia_codec_decodes_raw flag.
80 'target_name': 'raw_codec', 79 'target_name': 'raw_codec',
81 'product_name': 'raw_codec', 80 'product_name': 'raw_codec',
82 'type': 'static_library', 81 'type': 'static_library',
83 'dependencies': [ 82 'dependencies': [
84 'core.gyp:*', 83 'core.gyp:*',
85 'dng_sdk.gyp:dng_sdk-selector', 84 'dng_sdk.gyp:dng_sdk-selector',
86 'libjpeg-turbo-selector.gyp:libjpeg-turbo-selector', 85 'libjpeg-turbo-selector.gyp:libjpeg-turbo-selector',
87 'piex.gyp:piex-selector', 86 'piex.gyp:piex-selector',
88 ], 87 ],
89 'cflags':[ 88 'cflags':[
(...skipping 13 matching lines...) Expand all
103 '../src/core', 102 '../src/core',
104 ], 103 ],
105 'sources': [ 104 'sources': [
106 '../src/codec/SkRawAdapterCodec.cpp', 105 '../src/codec/SkRawAdapterCodec.cpp',
107 '../src/codec/SkRawCodec.cpp', 106 '../src/codec/SkRawCodec.cpp',
108 ], 107 ],
109 'direct_dependent_settings': { 108 'direct_dependent_settings': {
110 'include_dirs': [ 109 'include_dirs': [
111 '../include/codec', 110 '../include/codec',
112 ], 111 ],
113 'defines': [
114 'SK_CODEC_DECODES_RAW',
scroggo 2016/01/27 19:42:27 This is now defined everywhere, so it can be share
115 ],
116 }, 112 },
117 'defines': [
118 'SK_CODEC_DECODES_RAW',
119 ],
120 'conditions': [ 113 'conditions': [
121 ['skia_arch_type == "x86" or skia_arch_type == "arm"', { 114 ['skia_arch_type == "x86" or skia_arch_type == "arm"', {
122 'defines': [ 115 'defines': [
123 'qDNGBigEndian=0', 116 'qDNGBigEndian=0',
124 ], 117 ],
125 }], 118 }],
126 ['skia_os == "ios" or skia_os == "mac"', { 119 ['skia_os == "ios" or skia_os == "mac"', {
127 'xcode_settings': { 120 'xcode_settings': {
128 'OTHER_CFLAGS': ['-fexceptions'], 121 'OTHER_CFLAGS': ['-fexceptions'],
129 'OTHER_CPLUSPLUSFLAGS': ['-fexceptions'], 122 'OTHER_CPLUSPLUSFLAGS': ['-fexceptions'],
130 }, 123 },
131 }], 124 }],
132 ], 125 ],
133 }, 126 },
134 ], 127 ],
135 } 128 }
OLDNEW
« no previous file with comments | « dm/DM.cpp ('k') | gyp/common_conditions.gypi » ('j') | gyp/common_variables.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698