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

Side by Side Diff: gyp/images.gyp

Issue 1038863003: WIP: Added support for giflib, updated jpeg and png (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Fixed merge conflicts Created 5 years, 9 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
5 # GYP file for images project. 6 # GYP file for images project.
6 { 7 {
7 'targets': [ 8 'targets': [
8 { 9 {
9 'target_name': 'images', 10 'target_name': 'images',
10 'product_name': 'skia_images', 11 'product_name': 'skia_images',
11 'type': 'static_library', 12 'type': 'static_library',
12 'standalone_static_library': 1, 13 'standalone_static_library': 1,
13 'dependencies': [ 14 'dependencies': [
14 'core.gyp:*', 15 'core.gyp:*',
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 'sources!': [ 128 'sources!': [
128 '../src/images/SkImageDecoder_libgif.cpp', 129 '../src/images/SkImageDecoder_libgif.cpp',
129 '../src/images/SkMovie_gif.cpp', 130 '../src/images/SkMovie_gif.cpp',
130 ], 131 ],
131 }], 132 }],
132 [ 'skia_os == "android"', { 133 [ 'skia_os == "android"', {
133 'include_dirs': [ 134 'include_dirs': [
134 '../src/utils', 135 '../src/utils',
135 ], 136 ],
136 'dependencies': [ 137 'dependencies': [
137 'android_deps.gyp:gif', 138 'giflib.gyp:giflib',
djsollen 2015/03/27 01:20:51 do all platforms use this now? If so it can be add
scroggo 2015/03/27 12:38:51 Windows does not.
138 'android_deps.gyp:png', 139 'android_deps.gyp:png',
139 ], 140 ],
140 'conditions': [ 141 'conditions': [
141 [ 'skia_android_framework == 0', { 142 [ 'skia_android_framework == 0', {
142 'export_dependent_settings': [ 143 'export_dependent_settings': [
143 'android_deps.gyp:png', 144 'android_deps.gyp:png',
144 'libjpeg.gyp:*' 145 'libjpeg.gyp:*'
145 ], 146 ],
146 }, { 147 }, {
147 # The android framework disables these decoders as they are of lit tle use to 148 # The android framework disables these decoders as they are of lit tle use to
(...skipping 19 matching lines...) Expand all
167 }], 168 }],
168 ], 169 ],
169 'direct_dependent_settings': { 170 'direct_dependent_settings': {
170 'include_dirs': [ 171 'include_dirs': [
171 '../include/images', 172 '../include/images',
172 ], 173 ],
173 }, 174 },
174 }, 175 },
175 ], 176 ],
176 } 177 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698