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

Unified Diff: gyp/images.gyp

Issue 152513007: Build Skia for a bare-bones embedded Linux system. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: again Created 6 years, 10 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/images.gyp
diff --git a/gyp/images.gyp b/gyp/images.gyp
index fdbf2a0f666eb0e6b708c06af71884854c36f43f..13e768748141b0b613ea092524cb79999a17fa37 100644
--- a/gyp/images.gyp
+++ b/gyp/images.gyp
@@ -119,16 +119,14 @@
],
}],
[ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', {
- # Any targets that depend on this target should link in libpng, libgif, and
- # our code that calls it.
- # See http://code.google.com/p/gyp/wiki/InputFormatReference#Dependent_Settings
- 'link_settings': {
- 'libraries': [
- '-lgif',
- '-lpng',
- '-lz',
- ],
- },
+ 'export_dependent_settings': [
+ 'libpng.gyp:libpng',
+ 'giflib.gyp:giflib'
+ ],
+ 'dependencies': [
+ 'libpng.gyp:libpng',
+ 'giflib.gyp:giflib'
+ ],
# end libpng/libgif stuff
}],
# FIXME: NaCl should be just like linux, etc, above, but it currently is separated out
@@ -139,12 +137,6 @@
'../src/images/SkImageDecoder_libgif.cpp',
'../src/images/SkMovie_gif.cpp',
],
- 'link_settings': {
- 'libraries': [
- '-lpng',
- '-lz',
- ],
- },
}],
[ 'skia_os == "android"', {
'include_dirs': [
@@ -171,11 +163,6 @@
'dependencies': [
'chromeos_deps.gyp:gif',
],
- 'link_settings': {
- 'libraries': [
- '-lpng',
- ],
- },
}],
[ 'skia_os == "ios"', {
'include_dirs': [

Powered by Google App Engine
This is Rietveld 408576698