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

Unified Diff: gyp/images.gyp

Issue 2250683003: Add test for platform encoders, turn off platform encoders by default (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Test on windows Created 4 years, 4 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
Index: gyp/images.gyp
diff --git a/gyp/images.gyp b/gyp/images.gyp
index e4ab9edc100066f5e08a2f97192118fb3fecdbd2..7b1636e02b9845cdb1e8ab905e78d19039823ee8 100644
--- a/gyp/images.gyp
+++ b/gyp/images.gyp
@@ -17,6 +17,7 @@
'libjpeg-turbo-selector.gyp:libjpeg-turbo-selector',
'etc1.gyp:libetc1',
'ktx.gyp:libSkKTX',
+ 'libpng.gyp:libpng',
'libwebp.gyp:libwebp',
'utils.gyp:utils',
],
@@ -57,7 +58,6 @@
'conditions': [
[ 'skia_os == "win"', {
'sources!': [
- '../src/images/SkPNGImageEncoder.cpp',
'../src/images/SkGIFMovie.cpp',
],
'dependencies!': [
@@ -75,7 +75,6 @@
}],
[ 'skia_os in ["mac", "ios"]', {
'sources!': [
- '../src/images/SkPNGImageEncoder.cpp',
'../src/images/SkGIFMovie.cpp',
],
},{ #else if skia_os != mac
@@ -83,12 +82,6 @@
'../src/ports/SkImageEncoder_CG.cpp',
],
}],
- [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', {
- 'dependencies': [
- 'libpng.gyp:libpng',
- ],
- # end libpng stuff
- }],
[ 'skia_os == "android"', {
'include_dirs': [
'../src/utils',

Powered by Google App Engine
This is Rietveld 408576698