prepare skia for shared library build on android

gyp/images.gyp

Index: gyp/images.gyp
diff --git a/gyp/images.gyp b/gyp/images.gyp
index d63a59433c073a90a7ccf0268e3a8930c59bffb6..a3b50b62653f96de965edf88099d53ca532cbfd2 100644
--- a/gyp/images.gyp
+++ b/gyp/images.gyp
@@ -9,7 +9,6 @@
       'dependencies': [
         'libjpeg.gyp:*',
         'libwebp.gyp:libwebp',
-        'utils.gyp:utils',
       ],
       'export_dependent_settings': [
         'libjpeg.gyp:*',
@@ -96,6 +95,9 @@
             '../src/images/SkImageDecoder_libgif.cpp',
             '../src/images/SkMovie_gif.cpp',
           ],
+          'include_dirs': [
+            '../include/utils/mac',
+          ],
         },{ #else if skia_os != mac
           'sources!': [
             '../src/ports/SkImageDecoder_CG.cpp',
@@ -106,9 +108,6 @@
           # our code that calls it.
           # See http://code.google.com/p/gyp/wiki/InputFormatReference#Dependent_Settings
           'link_settings': {
-            'sources': [

[djsollen, 2013/05/30 20:35:29]

let's not include these modifications as they look to be specific to other
platforms.

-              '../src/images/SkImageDecoder_libpng.cpp',
-            ],
             'libraries': [
               '-lgif',
               '-lpng',
@@ -126,9 +125,6 @@
             '../src/images/SkMovie_gif.cpp',
           ],
           'link_settings': {
-            'sources': [
-              '../src/images/SkImageDecoder_libpng.cpp',
-            ],
             'libraries': [
               '-lpng',
               '-lz',
@@ -149,11 +145,6 @@
             '../src/images/SkImageRef_ashmem.cpp',
           ],
         }],
-        [ 'skia_os == "ios"', {
-           'include_dirs': [
-             '../include/utils/mac',
-           ],
-        }],
       ],
       'direct_dependent_settings': {
         'include_dirs': [