summaryrefslogtreecommitdiffstats
path: root/.DEPS.git
diff options
context:
space:
mode:
Diffstat (limited to '.DEPS.git')
-rw-r--r--.DEPS.git46
1 files changed, 34 insertions, 12 deletions
diff --git a/.DEPS.git b/.DEPS.git
index d0c6044..1c25926 100644
--- a/.DEPS.git
+++ b/.DEPS.git
@@ -4,17 +4,33 @@
# SEE http://code.google.com/p/chromium/wiki/UsingGit
# FOR HOW TO ROLL DEPS
vars = {
- 'ffmpeg_hash':
- '@0889dced5e40025c2ed0efd8e9e5e46e59d39c22',
'webkit_url':
'https://chromium.googlesource.com/chromium/blink.git',
'git_url':
'https://chromium.googlesource.com',
'webkit_rev':
- '@cd6ac360c6bea5b16ba20a7015935c0d3b4f161d'
+ '@cbee1e497ea4475b1693a7132763f3530d5593fb'
}
deps = {
+ 'build':
+ Var('git_url') + '/chromium/tools/build.git@909cb8303196a9db4013b4168fa088ba2872a0af',
+ 'build/scripts/command_wrapper/bin':
+ Var('git_url') + '/chromium/tools/command_wrapper/bin.git@2eeebba9a512cae9e4e9312f5ec728dbdad80bd0',
+ 'build/scripts/gsd_generate_index':
+ Var('git_url') + '/chromium/tools/gsd_generate_index.git@d2f5d5a5d212d8fb337d751c0351644a6ac83ac8',
+ 'build/scripts/private/data/reliability':
+ Var('git_url') + '/chromium/src.git@acfbc85e2980a8f596194dd8c0f49cbdc3860a5b',
+ 'build/third_party/gsutil':
+ Var('git_url') + '/external/gsutil/src.git@5cba434b828da428a906c8197a23c9ae120d2636',
+ 'build/third_party/lighttpd':
+ Var('git_url') + '/chromium/deps/lighttpd.git@9dfa55d15937a688a92cbf2b7a8621b0927d06eb',
+ 'commit-queue':
+ Var('git_url') + '/chromium/tools/commit-queue.git@706b8aa5feddd9c2d7523bac3901da895e83b380',
+ 'depot_tools':
+ Var('git_url') + '/chromium/tools/depot_tools.git@8aee486f6396a0dcd54f173f630bf1ea7646b7eb',
+ 'src':
+ Var('git_url') + '/chromium/src.git@c7f042ddd8025f00c3537e47b9964173aa7b4228',
'src/breakpad/src':
Var('git_url') + '/external/google-breakpad/src.git@c8d669904ad7843c295cf6653972b73a71fac455',
'src/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin':
@@ -36,7 +52,7 @@ deps = {
'src/testing/gtest':
Var('git_url') + '/external/googletest.git@a6772271f71672e889776bfe49ec4efd9da036df',
'src/third_party/WebKit':
- Var('webkit_url') + Var('webkit_rev'),
+ Var('webkit_url') + '' + Var('webkit_rev'),
'src/third_party/angle_dx11':
Var('git_url') + '/external/angle.git@a60e0805721f62c28a55faf2df74472cc5fc91fc',
'src/third_party/bidichecker':
@@ -46,7 +62,7 @@ deps = {
'src/third_party/cld_2/src':
Var('git_url') + '/external/cld2.git@b17c3c025db379fbeb56c4215bc1eb8737576f4c',
'src/third_party/ffmpeg':
- Var('git_url') + '/chromium/third_party/ffmpeg.git' + Var('ffmpeg_hash'),
+ Var('git_url') + '/chromium/deps/ffmpeg.git@bdcb9dc6b8990a77962ed232c84b9536e5be5b97',
'src/third_party/flac':
Var('git_url') + '/chromium/deps/flac.git@71e33f190a7bb144fe4e2014897b8d15c8247198',
'src/third_party/hunspell':
@@ -144,6 +160,8 @@ deps = {
deps_os = {
'android':
{
+ 'src/pdf':
+ None,
'src/third_party/android_tools':
Var('git_url') + '/android_tools.git@b3b75e0951a2fcb8380d5f74144ec34a654ce6b2',
'src/third_party/aosp':
@@ -226,7 +244,7 @@ deps_os = {
'src/third_party/mesa/src':
None,
'src/third_party/nss':
- Var('git_url') + '/chromium/deps/nss.git@4aaa389df767e7ab33d20fad7e74192de5439f31',
+ Var('git_url') + '/chromium/deps/nss.git@70e4daa9e4a6fd34c24c0a45ab6d477aba57a768',
'src/third_party/openmax_dl':
None,
'src/third_party/opus/src':
@@ -271,13 +289,13 @@ deps_os = {
'src/chrome/installer/mac/third_party/xz/xz':
Var('git_url') + '/chromium/deps/xz.git@eecaf55632ca72e90eb2641376bce7cdbc7284f7',
'src/chrome/tools/test/reference_build/chrome_mac':
- Var('git_url') + '/chromium/reference_builds/chrome_mac.git@a8728e50412349834f6d01dc18e6f6deace6ccbb',
+ Var('git_url') + '/chromium/reference_builds/chrome.git@1add884151176e42ddb946b68530e61c971ee3fa',
'src/third_party/GTM':
Var('git_url') + '/external/google-toolbox-for-mac.git@471407b943b14bcebe017dc6d098b3f54019eaba',
'src/third_party/lighttpd':
Var('git_url') + '/chromium/deps/lighttpd.git@9dfa55d15937a688a92cbf2b7a8621b0927d06eb',
'src/third_party/nss':
- Var('git_url') + '/chromium/deps/nss.git@4aaa389df767e7ab33d20fad7e74192de5439f31',
+ Var('git_url') + '/chromium/deps/nss.git@70e4daa9e4a6fd34c24c0a45ab6d477aba57a768',
'src/third_party/pdfsqueeze':
Var('git_url') + '/external/pdfsqueeze.git@5936b871e6a087b7e50d4cbcb122378d8a07499f',
'src/third_party/swig/mac':
@@ -285,8 +303,12 @@ deps_os = {
},
'unix':
{
+ 'build/third_party/cbuildbot_chromite':
+ Var('git_url') + '/chromiumos/chromite.git@58f01484052c1ba40fc1a604599738e7af69657a',
+ 'build/third_party/xvfb':
+ Var('git_url') + '/chromium/tools/third_party/xvfb.git@aebb1aadf1422e4d81e831e13746b8f7ae322e07',
'src/chrome/tools/test/reference_build/chrome_linux':
- Var('git_url') + '/chromium/reference_builds/chrome_linux64.git@daaa393fb0064aeefc3bb81cf41648e619b8e4cd',
+ Var('git_url') + '/chromium/reference_builds/chrome.git@1add884151176e42ddb946b68530e61c971ee3fa',
'src/third_party/chromite':
Var('git_url') + '/chromiumos/chromite.git@cbdd21c5ea76aa93ba4619a6d253697765f4de1f',
'src/third_party/cros_dbus_cplusplus/source':
@@ -319,9 +341,9 @@ deps_os = {
'win':
{
'src/chrome/tools/test/reference_build/chrome_win':
- Var('git_url') + '/chromium/reference_builds/chrome_win.git@e9e680bb8bd498d8a72810d33b55052794c6f5e2',
+ Var('git_url') + '/chromium/reference_builds/chrome.git@1add884151176e42ddb946b68530e61c971ee3fa',
'src/chrome_frame/tools/test/reference_build/chrome_win':
- Var('git_url') + '/chromium/reference_builds/chrome_win.git@b9f52667918a74977cb85eefd4e967150f852fbc',
+ Var('git_url') + '/chromium/reference_builds/chrome.git@1add884151176e42ddb946b68530e61c971ee3fa',
'src/third_party/bison':
Var('git_url') + '/chromium/deps/bison.git@083c9a45e4affdd5464ee2b224c2df649c6e26c3',
'src/third_party/cygwin':
@@ -337,7 +359,7 @@ deps_os = {
'src/third_party/nacl_sdk_binaries':
Var('git_url') + '/chromium/deps/nacl_sdk_binaries.git@759dfca03bdc774da7ecbf974f6e2b84f43699a5',
'src/third_party/nss':
- Var('git_url') + '/chromium/deps/nss.git@4aaa389df767e7ab33d20fad7e74192de5439f31',
+ Var('git_url') + '/chromium/deps/nss.git@70e4daa9e4a6fd34c24c0a45ab6d477aba57a768',
'src/third_party/pefile':
Var('git_url') + '/external/pefile.git@d0ca75794f69f1d09fd6d31d40ba2f1e9b3b7fb4',
'src/third_party/perl':