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

Unified Diff: gyp/giflib.gyp

Issue 1038863003: WIP: Added support for giflib, updated jpeg and png (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 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 side-by-side diff with in-line comments
Download patch
Index: gyp/giflib.gyp
diff --git a/gyp/giflib.gyp b/gyp/giflib.gyp
index 3a2c2153bf0ed6b52e5dc54c59e53ab15799babc..fd6ba2d4e383c3366c996d27c53a10f8718d0341 100644
--- a/gyp/giflib.gyp
+++ b/gyp/giflib.gyp
@@ -11,7 +11,7 @@
{
'target_name': 'giflib',
'conditions': [
- [ 'skia_giflib_static',
msarett 2015/03/26 18:22:46 As far as I can tell, this is always 0. So past c
scroggo 2015/03/26 18:29:34 Dead code. We should probably remove skia_giflib_s
msarett 2015/03/26 21:06:23 Done.
+ [ 'skia_os != "android"',
{
'type': 'static_library',
'defines': [
@@ -35,15 +35,11 @@
'../third_party/externals/giflib/gifalloc.c',
'../third_party/externals/giflib/gif_err.c',
],
- }, { # not skia_giflib_static
- 'type': 'none',
- 'direct_dependent_settings': {
- 'link_settings': {
- 'libraries': [
- '-lgif',
- ],
- },
- },
+ }, { # skia_os == "android"
djsollen 2015/03/26 19:51:05 let's not make the distinction between android and
scroggo 2015/03/26 20:10:11 We *do* need to make a distinction for skia_androi
msarett 2015/03/26 21:06:23 Gotcha.
+ 'type': 'static_library',
+ 'dependencies': [
+ 'android_deps.gyp:gif',
msarett 2015/03/26 18:22:46 For android, do what images.gyp does and use andro
+ ],
}
],
]

Powered by Google App Engine
This is Rietveld 408576698