summaryrefslogtreecommitdiffstats
path: root/.DEPS.git
diff options
context:
space:
mode:
Diffstat (limited to '.DEPS.git')
-rw-r--r--.DEPS.git40
1 files changed, 31 insertions, 9 deletions
diff --git a/.DEPS.git b/.DEPS.git
index 6adb64b..a5a9649 100644
--- a/.DEPS.git
+++ b/.DEPS.git
@@ -1,11 +1,9 @@
# DO NOT EDIT EXCEPT FOR LOCAL TESTING.
# THIS IS A GENERATED FILE.
# ALL MANUAL CHANGES WILL BE OVERWRITTEN.
-# SEE http://code.google.com/p/chromium/wiki/UsingNewGit
+# SEE http://code.google.com/p/chromium/wiki/UsingGit
# FOR HOW TO ROLL DEPS
vars = {
- 'ffmpeg_hash':
- '@aacd7f27b8e80d4371bdf77e46dff5396bc66b9b',
'webkit_url':
'https://chromium.googlesource.com/chromium/blink.git',
'git_url':
@@ -15,6 +13,24 @@ vars = {
}
deps = {
+ 'build':
+ Var('git_url') + '/chromium/tools/build.git@fbf1f6cb097009a48a7be6c9f6cbc93819673256',
+ '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@8eeff6bfed8e620388cee4da917cddb191a0b6cb',
+ 'depot_tools':
+ Var('git_url') + '/chromium/tools/depot_tools.git@4d3ed59ab75208aaad7ca05eae79fab0c8f5116c',
+ 'src':
+ Var('git_url') + '/chromium/src.git@1ef6d1ba3956ba239456e5070d6f08e0ab0c3483',
'src/breakpad/src':
Var('git_url') + '/external/google-breakpad/src.git@e606843702910c3691a49588fcdc311d9f55b6a3',
'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@e5014a97e29c0d88d47c693ed168c00f61551e53',
'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@0ac33ca22f4003949f00ec82b917696745fc982e',
'src/third_party/flac':
Var('git_url') + '/chromium/deps/flac.git@71e33f190a7bb144fe4e2014897b8d15c8247198',
'src/third_party/hunspell':
@@ -142,6 +158,8 @@ deps = {
deps_os = {
'android':
{
+ 'src/pdf':
+ None,
'src/third_party/android_tools':
Var('git_url') + '/android_tools.git@e504b737693e96816b40e6ae80d177352c079c18',
'src/third_party/aosp':
@@ -261,7 +279,7 @@ deps_os = {
'src/chrome/installer/mac/third_party/xz/xz':
Var('git_url') + '/chromium/deps/xz.git@dd8415469606fe7bfdc2ebc12b8457b912ede326',
'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':
@@ -275,8 +293,12 @@ deps_os = {
},
'unix':
{
+ 'build/third_party/cbuildbot_chromite':
+ Var('git_url') + '/chromiumos/chromite.git@05408b820ef2bbb101378b74c223e628890f43d8',
+ '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_linux.git@d2c2fe41693de657ef707f59d6f43aa64dca71a2',
+ 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':
@@ -307,9 +329,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':