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

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: Added conditionals to jpeg and png sources, removed extra giflib 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.
2 #
3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file.
5
1 # GYP file for images project. 6 # GYP file for images project.
2 { 7 {
3 'targets': [ 8 'targets': [
4 { 9 {
5 'target_name': 'images', 10 'target_name': 'images',
6 'product_name': 'skia_images', 11 'product_name': 'skia_images',
7 'type': 'static_library', 12 'type': 'static_library',
8 'standalone_static_library': 1, 13 'standalone_static_library': 1,
9 'dependencies': [ 14 'dependencies': [
10 'core.gyp:*', 15 'core.gyp:*',
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 'sources!': [ 128 'sources!': [
124 '../src/images/SkImageDecoder_libgif.cpp', 129 '../src/images/SkImageDecoder_libgif.cpp',
125 '../src/images/SkMovie_gif.cpp', 130 '../src/images/SkMovie_gif.cpp',
126 ], 131 ],
127 }], 132 }],
128 [ 'skia_os == "android"', { 133 [ 'skia_os == "android"', {
129 'include_dirs': [ 134 'include_dirs': [
130 '../src/utils', 135 '../src/utils',
131 ], 136 ],
132 'dependencies': [ 137 'dependencies': [
133 'android_deps.gyp:gif', 138 'giflib.gyp:giflib',
134 'android_deps.gyp:png', 139 'android_deps.gyp:png',
135 ], 140 ],
136 'conditions': [ 141 'conditions': [
137 [ 'skia_android_framework == 0', { 142 [ 'skia_android_framework == 0', {
138 'export_dependent_settings': [ 143 'export_dependent_settings': [
139 'android_deps.gyp:png', 144 'android_deps.gyp:png',
140 'libjpeg.gyp:*' 145 'libjpeg.gyp:*'
141 ], 146 ],
142 }, { 147 }, {
143 # 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
163 }], 168 }],
164 ], 169 ],
165 'direct_dependent_settings': { 170 'direct_dependent_settings': {
166 'include_dirs': [ 171 'include_dirs': [
167 '../include/images', 172 '../include/images',
168 ], 173 ],
169 }, 174 },
170 }, 175 },
171 ], 176 ],
172 } 177 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698