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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gyp/images.gyp

Issue 12604006: Upstream Android modifications to the image encoders/decoders. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 9 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
« DEPS ('K') | « DEPS ('k') | gyp/libwebp.gyp » ('j') | include/images/SkBitmapRegionDecoder.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/images.gyp
diff --git a/gyp/images.gyp b/gyp/images.gyp
index b5447a27a554ec42171b7197aab3d086354d8a0e..32c7459d80b7e919cb2496d0d15103042e05df76 100644
--- a/gyp/images.gyp
+++ b/gyp/images.gyp
@@ -7,6 +7,7 @@
'standalone_static_library': 1,
'dependencies': [
'libjpeg.gyp:*',
+ 'libwebp.gyp:libwebp',
'utils.gyp:utils',
],
'export_dependent_settings': [
@@ -31,13 +32,17 @@
'../src/images/bmpdecoderhelper.cpp',
'../src/images/bmpdecoderhelper.h',
+
+ '../src/images/SkBitmapRegionDecoder.cpp',
+
'../src/images/SkImageDecoder.cpp',
'../src/images/SkImageDecoder_Factory.cpp',
- '../src/images/SkImageDecoder_libjpeg.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_libwebp.cpp',
'../src/images/SkImageDecoder_wbmp.cpp',
'../src/images/SkImageEncoder.cpp',
'../src/images/SkImageEncoder_Factory.cpp',
« DEPS ('K') | « DEPS ('k') | gyp/libwebp.gyp » ('j') | include/images/SkBitmapRegionDecoder.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698