summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authorhbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-13 12:02:42 +0000
committerhbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-13 12:02:42 +0000
commit76ce15236427bf55dd763584ee748108b39334b1 (patch)
treea253a58cd019b85d901caf5d408312e81c2f81b1 /DEPS
parentcb40517540ee6c884624303e3e37500ddab5f9fd (diff)
downloadchromium_src-76ce15236427bf55dd763584ee748108b39334b1.zip
chromium_src-76ce15236427bf55dd763584ee748108b39334b1.tar.gz
chromium_src-76ce15236427bf55dd763584ee748108b39334b1.tar.bz2
Pulls libjpeg-turbo and yasm to the Chromium tree.
This change pulls the source code of libjpeg-turbo and the Windows binary of yasm. (We need to change '~/.gyp/include.gypi' and set 'use_libjpeg_turbo' to 1 to use libjpeg-turbo, though.) TBR=brettw,mark BUG=48789 TEST=none Review URL: http://codereview.chromium.org/5723004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68992 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'DEPS')
-rw-r--r--DEPS7
1 files changed, 7 insertions, 0 deletions
diff --git a/DEPS b/DEPS
index b0a0a11..4eb6ae7 100644
--- a/DEPS
+++ b/DEPS
@@ -183,6 +183,9 @@ deps = {
"src/third_party/yasm/source/patched-yasm":
"/trunk/deps/third_party/yasm/patched-yasm@50870",
+
+ "src/third_party/libjpeg_turbo":
+ "/trunk/deps/third_party/libjpeg_turbo@66929",
}
@@ -226,6 +229,10 @@ deps_os = {
"src/rlz":
(Var("googlecode_url") % "rlz") + "/trunk@31",
+
+ # Dependencies used by libjpeg-turbo
+ "src/third_party/yasm/binaries":
+ "/trunk/deps/third_party/yasm/binaries@66803",
},
"mac": {
"src/chrome/tools/test/reference_build/chrome_mac":