prepare skia for shared library build on android

gyp/images.gyp

 # GYP file for images project.
 {
   'targets': [
     {
       'target_name': 'images',
       'product_name': 'skia_images',
       'type': 'static_library',
       'standalone_static_library': 1,
       'dependencies': [
         'libjpeg.gyp:*',
         'libwebp.gyp:libwebp',
-        'utils.gyp:utils',
       ],
       'export_dependent_settings': [
         'libjpeg.gyp:*',
       ],
       'include_dirs': [
         '../include/config',
         '../include/core',
         '../include/images',
         '../include/lazy',
         # for access to SkErrorInternals.h
@@ skipping 66 matching lines @@
             '../src/ports/SkImageDecoder_WIC.cpp',
           ],
         }],
         [ 'skia_os in ["mac", "ios"]', {
           'sources!': [
             '../src/images/SkImageDecoder_FactoryDefault.cpp',
             '../src/images/SkImageDecoder_libpng.cpp',
             '../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',
           ],
         }],
         [ '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': {
-            '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',
               '-lz',
             ],
           },
           # end libpng/libgif stuff
         }],
         # FIXME: NaCl should be just like linux, etc, above, but it currently is separated out
         # to remove gif. Once gif is supported by naclports, this can be merged into the above
         # condition.
         [ 'skia_os == "nacl"', {
           'sources!': [
             '../src/images/SkImageDecoder_libgif.cpp',
             '../src/images/SkMovie_gif.cpp',
           ],
           'link_settings': {
-            'sources': [
-              '../src/images/SkImageDecoder_libpng.cpp',
-            ],
             'libraries': [
               '-lpng',
               '-lz',
             ],
           },
         }],
         [ 'skia_os == "android"', {
           'include_dirs': [
              '../src/utils',
           ],
           'dependencies': [
              'android_deps.gyp:gif',
              'android_deps.gyp:png',
           ],
         },{ #else if skia_os != android
           'sources!': [
             '../src/images/SkImageRef_ashmem.h',
             '../src/images/SkImageRef_ashmem.cpp',
           ],
         }],
-        [ 'skia_os == "ios"', {
-           'include_dirs': [
-             '../include/utils/mac',
-           ],
-        }],
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '../include/images',
           '../include/lazy',
         ],
       },
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: