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

Side by Side Diff: gyp/images.gyp

Issue 178413003: Fix ChromeOS build broken in f84722e4777 (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: x Created 6 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 | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # GYP file for images project. 1 # GYP file for images project.
2 { 2 {
3 'targets': [ 3 'targets': [
4 { 4 {
5 'target_name': 'images', 5 'target_name': 'images',
6 'product_name': 'skia_images', 6 'product_name': 'skia_images',
7 'type': 'static_library', 7 'type': 'static_library',
8 'standalone_static_library': 1, 8 'standalone_static_library': 1,
9 'dependencies': [ 9 'dependencies': [
10 'core.gyp:*', 10 'core.gyp:*',
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 ], 155 ],
156 },{ #else if skia_os != android 156 },{ #else if skia_os != android
157 'sources!': [ 157 'sources!': [
158 '../src/images/SkImageRef_ashmem.h', 158 '../src/images/SkImageRef_ashmem.h',
159 '../src/images/SkImageRef_ashmem.cpp', 159 '../src/images/SkImageRef_ashmem.cpp',
160 ], 160 ],
161 }], 161 }],
162 [ 'skia_os == "chromeos"', { 162 [ 'skia_os == "chromeos"', {
163 'dependencies': [ 163 'dependencies': [
164 'chromeos_deps.gyp:gif', 164 'chromeos_deps.gyp:gif',
165 'libpng.gyp:libpng',
165 ], 166 ],
166 }], 167 }],
167 [ 'skia_os == "ios"', { 168 [ 'skia_os == "ios"', {
168 'include_dirs': [ 169 'include_dirs': [
169 '../include/utils/mac', 170 '../include/utils/mac',
170 ], 171 ],
171 }], 172 }],
172 ], 173 ],
173 'direct_dependent_settings': { 174 'direct_dependent_settings': {
174 'include_dirs': [ 175 'include_dirs': [
175 '../include/images', 176 '../include/images',
176 ], 177 ],
177 }, 178 },
178 }, 179 },
179 ], 180 ],
180 } 181 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698