summaryrefslogtreecommitdiffstats
path: root/.DEPS.git
diff options
context:
space:
mode:
Diffstat (limited to '.DEPS.git')
-rw-r--r--.DEPS.git44
1 files changed, 34 insertions, 10 deletions
diff --git a/.DEPS.git b/.DEPS.git
index 0cdba4a..5c57879 100644
--- a/.DEPS.git
+++ b/.DEPS.git
@@ -4,17 +4,35 @@
# SEE http://code.google.com/p/chromium/wiki/UsingGit
# FOR HOW TO ROLL DEPS
vars = {
- 'ffmpeg_hash':
- '@9186343787c9fe2af1a3b0350ac556508dfbaaf6',
'webkit_url':
'https://chromium.googlesource.com/chromium/blink.git',
'git_url':
'https://chromium.googlesource.com',
'webkit_rev':
- '@a512051b47383b4737a5ab513dc163a411ed7f30'
+ '@a512051b47383b4737a5ab513dc163a411ed7f30',
+ 'angle_revision':
+ '95fa672f26db492aee2076b0acb524149d52c68f'
}
deps = {
+ 'build':
+ Var('git_url') + '/chromium/tools/build.git@22bd15a2560839f9794ab9c5d071507f3fe64b4c',
+ '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@b0936d257dbc943ee00dd91a86d659ea346b135b',
+ '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@ea18ffc0dc42c551027454088605d44fb926a3dd',
+ 'depot_tools':
+ Var('git_url') + '/chromium/tools/depot_tools.git@aeab41a34141b913ee79532c2d53d9c6c365b6c2',
+ 'src':
+ Var('git_url') + '/chromium/src.git@73405fba9bf7634101b236b3cca29448077556dc',
'src/breakpad/src':
Var('git_url') + '/external/google-breakpad/src.git@d988fc9afa086af8a45b32fb0ebe645f80119b4a',
'src/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin':
@@ -36,9 +54,9 @@ deps = {
'src/testing/gtest':
Var('git_url') + '/external/googletest.git@74de57c951aedebc5dfe26a27604353432392b98',
'src/third_party/WebKit':
- Var('webkit_url') + Var('webkit_rev'),
+ Var('webkit_url') + '' + Var('webkit_rev'),
'src/third_party/angle':
- Var('git_url') + '/angle/angle.git@95fa672f26db492aee2076b0acb524149d52c68f',
+ Var('git_url') + '/angle/angle.git' + '@' + Var('angle_revision'),
'src/third_party/angle_dx11':
Var('git_url') + '/external/angle.git@af640efbfdbe80909016fc623bb65f010a2e551f',
'src/third_party/bidichecker':
@@ -50,7 +68,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@6ffe17477b08bd97ade98f939763e7fc3c414086',
'src/third_party/flac':
Var('git_url') + '/chromium/deps/flac.git@71e33f190a7bb144fe4e2014897b8d15c8247198',
'src/third_party/hunspell':
@@ -148,6 +166,8 @@ deps = {
deps_os = {
'android':
{
+ 'src/pdf':
+ None,
'src/third_party/android_tools':
Var('git_url') + '/android_tools.git@25cf2d85072b06f78956ecaacd564ef56a054d65',
'src/third_party/aosp':
@@ -277,7 +297,7 @@ 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@1dc401bb64a752dfd927fe8e94f2dc633033c074',
+ 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':
@@ -291,8 +311,12 @@ deps_os = {
},
'unix':
{
+ 'build/third_party/cbuildbot_chromite':
+ Var('git_url') + '/chromiumos/chromite.git@f8ec912fd89831ac4962cdd1a582062f707a961e',
+ '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@8a219d7b1e4a0f647849ab9db0291944d83d3f79',
+ 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':
@@ -325,9 +349,9 @@ deps_os = {
'win':
{
'src/chrome/tools/test/reference_build/chrome_win':
- Var('git_url') + '/chromium/reference_builds/chrome_win.git@8287e332c3767dce02d9f7ba2f6a0de8c4f80f19',
+ 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':