aboutsummaryrefslogtreecommitdiffhomepage
path: root/gyp/images.gyp
diff options
context:
space:
mode:
authorGravatar msarett <msarett@google.com>2016-03-23 19:19:28 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-03-23 19:19:28 -0700
commitf037fdebda2a2626e6512d7532063f2cd41a264d (patch)
treec9e722006b56c664953a68699a2bafef8f104035 /gyp/images.gyp
parente8f3062a36d3682f4019309a32b5b84dc9eddf8c (diff)
Delete SkImageDecoder
This image decoding implementation has been replaced by SkCodec in Android. Additionally, we have replaced uses of SkImageDecoder in Skia and Google3 with uses of SkCodec. Now we can delete SkImageDecoder :). BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1820503002 CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot Committed: https://skia.googlesource.com/skia/+/f799706656f2581c5bf5510d94df3fa17cce1607 Committed: https://skia.googlesource.com/skia/+/5b6e73e0c8282c4d85accbfbcecc6dee84f8a1eb Review URL: https://codereview.chromium.org/1820503002
Diffstat (limited to 'gyp/images.gyp')
-rw-r--r--gyp/images.gyp29
1 files changed, 1 insertions, 28 deletions
diff --git a/gyp/images.gyp b/gyp/images.gyp
index 8c5b0a7d1b..53f505d925 100644
--- a/gyp/images.gyp
+++ b/gyp/images.gyp
@@ -31,36 +31,17 @@
],
'sources': [
'../include/images/SkForceLinking.h',
- '../src/images/SkJpegUtility.h',
'../include/images/SkMovie.h',
'../include/images/SkPageFlipper.h',
- '../src/images/bmpdecoderhelper.cpp',
- '../src/images/bmpdecoderhelper.h',
-
'../src/images/SkForceLinking.cpp',
- '../src/images/SkImageDecoder.cpp',
'../src/images/SkImageDecoder_FactoryDefault.cpp',
- '../src/images/SkImageDecoder_FactoryRegistrar.cpp',
- # If decoders are added/removed to/from (all/individual)
+ # If encoders are added/removed to/from (all/individual)
# platform(s), be sure to update SkForceLinking.cpp
# so the right decoders will be forced to link.
- # IMPORTANT: The build order of the SkImageDecoder_*.cpp files
- # defines the order image decoders are tested when decoding a
- # stream. The last decoder is the first one tested, so the .cpp
- # files should be in listed in order from the least likely to be
- # used, to the most likely (jpeg and png should be the last two
- # for instance.) As a result, they are deliberately not in
- # alphabetical order.
- '../src/images/SkImageDecoder_wbmp.cpp',
- '../src/images/SkImageDecoder_pkm.cpp',
'../src/images/SkImageDecoder_ktx.cpp',
- '../src/images/SkImageDecoder_astc.cpp',
- '../src/images/SkImageDecoder_libbmp.cpp',
- '../src/images/SkImageDecoder_libgif.cpp',
- '../src/images/SkImageDecoder_libico.cpp',
'../src/images/SkImageDecoder_libwebp.cpp',
'../src/images/SkImageDecoder_libjpeg.cpp',
'../src/images/SkImageDecoder_libpng.cpp',
@@ -72,8 +53,6 @@
'../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',
@@ -81,8 +60,6 @@
'conditions': [
[ 'skia_os == "win"', {
'sources!': [
- '../src/images/SkImageDecoder_FactoryDefault.cpp',
- '../src/images/SkImageDecoder_libgif.cpp',
'../src/images/SkImageDecoder_libpng.cpp',
'../src/images/SkMovie_gif.cpp',
],
@@ -101,9 +78,7 @@
}],
[ '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',
],
},{ #else if skia_os != mac
@@ -129,9 +104,7 @@
# The android framework disables these decoders as they are of little use to
# Java applications that can't take advantage of the compressed formats.
'sources!': [
- '../src/images/SkImageDecoder_pkm.cpp',
'../src/images/SkImageDecoder_ktx.cpp',
- '../src/images/SkImageDecoder_astc.cpp',
],
}],
],