Skia merge (revision 3022)

This CL has companion changes to account for API updates in...
 (1) frameworks/base
 (2) external/webkit

Change-Id: Ibb989e76e8bd24313849f9631dbef42cdef9eb7d

1 files changed, 149 insertions, 0 deletions

diff --git a/gyp/images.gyp b/gyp/images.gyp
new file mode 100644
index 0000000..0732351
--- /dev/null
+++ b/gyp/images.gyp
@@ -0,0 +1,149 @@
+{
+  'includes': [
+    'common.gypi',
+  ],
+  'targets': [
+    {
+      'target_name': 'images',
+      'type': 'static_library',
+      'dependencies': [
+        'utils.gyp:utils',
+      ],
+      'include_dirs': [
+        '../include/config',
+        '../include/core',
+        '../include/images',
+      ],
+      'sources': [
+        '../include/images/SkFlipPixelRef.h',
+        '../include/images/SkImageDecoder.h',
+        '../include/images/SkImageEncoder.h',
+        '../include/images/SkImageRef.h',
+        '../include/images/SkImageRef_GlobalPool.h',
+        '../include/images/SkJpegUtility.h',
+        '../include/images/SkMovie.h',
+        '../include/images/SkPageFlipper.h',
+
+        '../src/images/bmpdecoderhelper.cpp',
+        '../src/images/bmpdecoderhelper.h',
+        '../src/images/SkBitmapRegionDecoder.cpp',
+        '../src/images/SkBitmap_RLEPixels.h',
+        '../src/images/SkCreateRLEPixelRef.cpp',
+        '../src/images/SkFDStream.cpp',
+        '../src/images/SkFlipPixelRef.cpp',
+        '../src/images/SkImageDecoder.cpp',
+        '../src/images/SkImageDecoder_Factory.cpp',
+        '../src/images/SkImageDecoder_libbmp.cpp',
+        '../src/images/SkImageDecoder_libgif.cpp',
+        '../src/images/SkImageDecoder_libico.cpp',
+        '../src/images/SkImageDecoder_libjpeg.cpp',
+        '../src/images/SkImageDecoder_libpng.cpp',
+        '../src/images/SkImageDecoder_wbmp.cpp',
+        '../src/images/SkImageEncoder.cpp',
+        '../src/images/SkImageEncoder_Factory.cpp',
+        '../src/images/SkImageRef.cpp',
+        '../src/images/SkImageRefPool.cpp',
+        '../src/images/SkImageRefPool.h',
+        '../src/images/SkImageRef_GlobalPool.cpp',
+        '../src/images/SkJpegUtility.cpp',
+        '../src/images/SkMovie.cpp',
+        '../src/images/SkMovie_gif.cpp',
+        '../src/images/SkPageFlipper.cpp',
+        '../src/images/SkScaledBitmapSampler.cpp',
+        '../src/images/SkScaledBitmapSampler.h',
+
+        '../src/ports/SkImageDecoder_CG.cpp',
+        '../src/ports/SkImageDecoder_WIC.cpp',
+      ],
+      'conditions': [
+        [ 'skia_os == "win"', {
+          'sources!': [
+            '../include/images/SkJpegUtility.h',
+
+            '../src/images/SkFDStream.cpp',
+            '../src/images/SkImageDecoder_Factory.cpp',
+            '../src/images/SkImageDecoder_libgif.cpp',
+            '../src/images/SkImageDecoder_libjpeg.cpp',
+            '../src/images/SkImageDecoder_libpng.cpp',
+            '../src/images/SkImageDecoder_libpvjpeg.c',
+            '../src/images/SkImageEncoder_Factory.cpp',
+            '../src/images/SkJpegUtility.cpp',
+            '../src/images/SkMovie_gif.cpp',
+          ],
+          'link_settings': {
+            'libraries': [
+              'windowscodecs.lib',
+            ],
+          },
+        },{ #else if skia_os != win
+          'sources!': [
+            '../src/ports/SkImageDecoder_WIC.cpp',
+          ],
+        }],
+        [ 'skia_os == "mac"', {
+          'sources!': [
+            '../include/images/SkJpegUtility.h',
+
+            '../src/images/SkImageDecoder_Factory.cpp',
+            '../src/images/SkImageDecoder_libpng.cpp',
+            '../src/images/SkImageDecoder_libgif.cpp',
+            '../src/images/SkImageDecoder_libjpeg.cpp',
+            '../src/images/SkImageDecoder_libpvjpeg.c',
+            '../src/images/SkImageEncoder_Factory.cpp',
+            '../src/images/SkJpegUtility.cpp',
+            '../src/images/SkMovie_gif.cpp',
+          ],
+        },{ #else if skia_os != mac
+          'sources!': [
+            '../src/ports/SkImageDecoder_CG.cpp',
+          ],
+        }],
+        [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', {
+          'sources!': [
+            '../include/images/SkJpegUtility.h',
+
+            '../src/images/SkImageDecoder_libjpeg.cpp',
+            '../src/images/SkImageDecoder_libgif.cpp',
+            '../src/images/SkImageDecoder_libpvjpeg.c',
+            '../src/images/SkJpegUtility.cpp',
+            '../src/images/SkMovie_gif.cpp',
+          ],
+          # libpng stuff:
+          # Any targets that depend on this target should link in libpng and
+          # our code that calls it.
+          # See http://code.google.com/p/gyp/wiki/InputFormatReference#Dependent_Settings
+          'link_settings': {
+            'sources': [
+              '../src/images/SkImageDecoder_libpng.cpp',
+            ],
+            'libraries': [
+              '-lpng',
+            ],
+          },
+          # end libpng stuff
+        }],
+        [ 'skia_os == "android"', {
+          'sources!': [
+            '../src/images/SkImageDecoder_libjpeg.cpp',
+            '../src/images/SkJpegUtility.cpp',
+          ],
+          'dependencies': [
+             'android_system.gyp:gif',
+             'android_system.gyp:png',
+          ],
+        }],
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '../include/images',
+        ],
+      },
+    },
+  ],
+}
+
+# Local Variables:
+# tab-width:2
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=2 shiftwidth=2: