Build Skia for a bare-bones embedded Linux system.

gyp/images.gyp

Index: gyp/images.gyp
diff --git a/gyp/images.gyp b/gyp/images.gyp
index fdbf2a0f666eb0e6b708c06af71884854c36f43f..c7db8b696998b23f19f18fa3254a588afaa7a43c 100644
--- a/gyp/images.gyp
+++ b/gyp/images.gyp
@@ -11,11 +11,13 @@
         'libjpeg.gyp:*',
         'libwebp.gyp:libwebp',
         'utils.gyp:utils',
+        'libpng.gyp:libpng',
       ],
       'conditions': [
         [ 'skia_android_framework == 0', {
           'export_dependent_settings': [
             'libjpeg.gyp:*',
+           'libpng.gyp:libpng',

[scroggo, 2014/02/06 16:22:13]

nit: should line up with libjpeg.

[djsollen, 2014/02/06 16:24:34]

spacing

[hal.canary, 2014/02/06 18:01:57]

Done.

[hal.canary, 2014/02/06 18:01:57]

Done.

           ],
         }],
       ],
@@ -122,13 +124,9 @@
           # Any targets that depend on this target should link in libpng, libgif, and

[scroggo, 2014/02/06 16:22:13]

This comment is out of date.

[djsollen, 2014/02/06 16:24:34]

this comment is out of date and should be removed.

[hal.canary, 2014/02/06 18:01:57]

Done.

[hal.canary, 2014/02/06 18:01:57]

Done.

           # our code that calls it.
           # See http://code.google.com/p/gyp/wiki/InputFormatReference#Dependent_Settings
-          'link_settings': {
-            'libraries': [
-              '-lgif',
-              '-lpng',
-              '-lz',
-            ],
-          },
+          'dependencies': [
+            'giflib.gyp:giflib'

[scroggo, 2014/02/06 16:22:13]

It appears that without this change, the images project will have these
libraries as link_settings, but with it, giflib will have -lgif as a
link_setting, and images will depend on giflib. Does that accomplish the same
thing?

[hal.canary, 2014/02/06 18:01:57]

Exactly.  giflib.gyp uses direct_dependent_settings.

+          ]
           # 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': [