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

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: Merge 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
« no previous file with comments | « gyp/common_variables.gypi ('k') | gyp/images.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/giflib.gyp
diff --git a/gyp/giflib.gyp b/gyp/giflib.gyp
index 3a2c2153bf0ed6b52e5dc54c59e53ab15799babc..9263835d2e8893382ebe97d34453f0b6568ffb5d 100644
--- a/gyp/giflib.gyp
+++ b/gyp/giflib.gyp
@@ -11,7 +11,7 @@
{
'target_name': 'giflib',
'conditions': [
- [ 'skia_giflib_static',
+ [ 'skia_android_framework == 0',
{
'type': 'static_library',
'defines': [
@@ -35,17 +35,18 @@
'../third_party/externals/giflib/gifalloc.c',
'../third_party/externals/giflib/gif_err.c',
],
- }, { # not skia_giflib_static
+ }, { # skia_android_framework
'type': 'none',
'direct_dependent_settings': {
- 'link_settings': {
- 'libraries': [
- '-lgif',
- ],
- },
- },
+ 'libraries' : [
+ 'libgif.a',
+ ],
+ 'include_dirs': [
+ 'external/giflib',
+ ]
+ }
}
- ],
+ ]
]
}
]
« no previous file with comments | « gyp/common_variables.gypi ('k') | gyp/images.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698