aboutsummaryrefslogtreecommitdiffhomepage
path: root/DEPS
diff options
context:
space:
mode:
authorGravatar msarett <msarett@google.com>2015-11-06 11:15:49 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2015-11-06 11:15:49 -0800
commitb747b90501823cc160848957dfa552877d83b11d (patch)
tree05fadab2d69f6714e69ec787800791cd30e88692 /DEPS
parent69ad6a9d03dd6f14b7c730465319313725a7c903 (diff)
Remove dependencies on Android's forked decoder libraries
Disable SkImageDecoder's code which relies on Android's customized libpng and libjpeg. Build standard versions of libpng and libjpeg-turbo everywhere. The SkImageDecoder code has been replaced with SkCodec, which can decode subsets using standard library APIs BUG=skia: Review URL: https://codereview.chromium.org/1406153015
Diffstat (limited to 'DEPS')
-rw-r--r--DEPS2
1 files changed, 0 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index 9a0c5cc40b..1fc09aaa78 100644
--- a/DEPS
+++ b/DEPS
@@ -28,8 +28,6 @@ deps = {
"third_party/externals/yasm/binaries" : "https://chromium.googlesource.com/chromium/deps/yasm/binaries.git@52f9b3f4b0aa06da24ef8b123058bb61ee468881",
"platform_tools/android/third_party/externals/expat" : "https://android.googlesource.com/platform/external/expat.git@android-5.1.0_r3",
- "platform_tools/android/third_party/externals/jpeg" : "https://android.googlesource.com/platform/external/jpeg.git@android-5.1.0_r3",
- "platform_tools/android/third_party/externals/png" : "https://android.googlesource.com/platform/external/libpng.git@android-4.2.2_r1.2",
"platform_tools/chromeos/toolchain/src/third_party/chromite": "https://chromium.googlesource.com/chromiumos/chromite.git@d6a4c7e0ee4d53ddc5238dbddfc0417796a70e54",
"platform_tools/chromeos/toolchain/src/third_party/pyelftools": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git@bdc1d380acd88d4bfaf47265008091483b0d614e",