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

Side by Side Diff: gyp/images.gyp

Issue 1036283002: Remove all code related to NaCl (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Rebase Created 5 years, 8 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 | « gyp/gpu.gypi ('k') | gyp/nacl.gyp » ('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 5
6 # GYP file for images project. 6 # GYP file for images project.
7 { 7 {
8 'targets': [ 8 'targets': [
9 { 9 {
10 'target_name': 'images', 10 'target_name': 'images',
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 }], 116 }],
117 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { 117 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', {
118 'export_dependent_settings': [ 118 'export_dependent_settings': [
119 'libpng.gyp:libpng', 119 'libpng.gyp:libpng',
120 ], 120 ],
121 'dependencies': [ 121 'dependencies': [
122 'libpng.gyp:libpng', 122 'libpng.gyp:libpng',
123 ], 123 ],
124 # end libpng stuff 124 # end libpng stuff
125 }], 125 }],
126 # FIXME: NaCl should be just like linux, etc, above, but it currently is separated out
127 # to remove gif. Once gif is supported by naclports, this can be merged into the above
128 # condition.
129 [ 'skia_os == "nacl"', {
130 'sources!': [
131 '../src/images/SkImageDecoder_libgif.cpp',
132 '../src/images/SkMovie_gif.cpp',
133 ],
134 'dependencies!': [
135 'giflib.gyp:giflib'
136 ],
137 }],
138 [ 'skia_os == "android"', { 126 [ 'skia_os == "android"', {
139 'include_dirs': [ 127 'include_dirs': [
140 '../src/utils', 128 '../src/utils',
141 ], 129 ],
142 'dependencies': [ 130 'dependencies': [
143 'android_deps.gyp:png', 131 'android_deps.gyp:png',
144 ], 132 ],
145 'conditions': [ 133 'conditions': [
146 [ 'skia_android_framework == 0', { 134 [ 'skia_android_framework == 0', {
147 'export_dependent_settings': [ 135 'export_dependent_settings': [
(...skipping 23 matching lines...) Expand all
171 }], 159 }],
172 ], 160 ],
173 'direct_dependent_settings': { 161 'direct_dependent_settings': {
174 'include_dirs': [ 162 'include_dirs': [
175 '../include/images', 163 '../include/images',
176 ], 164 ],
177 }, 165 },
178 }, 166 },
179 ], 167 ],
180 } 168 }
OLDNEW
« no previous file with comments | « gyp/gpu.gypi ('k') | gyp/nacl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698