summaryrefslogtreecommitdiffstats
path: root/.DEPS.git
diff options
context:
space:
mode:
Diffstat (limited to '.DEPS.git')
-rw-r--r--.DEPS.git36
1 files changed, 29 insertions, 7 deletions
diff --git a/.DEPS.git b/.DEPS.git
index f94f244..33a8ef7 100644
--- a/.DEPS.git
+++ b/.DEPS.git
@@ -4,8 +4,6 @@
# SEE http://code.google.com/p/chromium/wiki/UsingGit
# FOR HOW TO ROLL DEPS
vars = {
- 'ffmpeg_hash':
- '@681ca6bfed239ad2e1a6a3c8a586839c6dbd3e87',
'webkit_url':
'https://chromium.googlesource.com/chromium/blink.git',
'git_url':
@@ -17,6 +15,24 @@ vars = {
}
deps = {
+ 'build':
+ Var('git_url') + '/chromium/tools/build.git@c9d9010e4fe778f28fd45cce098a9222d6c02308',
+ '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/scripts/tools/deps2git':
+ Var('git_url') + '/chromium/tools/deps2git.git@26967ce93af298ddfa1d91e9d4b1cc4af14ce96c',
+ 'build/third_party/lighttpd':
+ Var('git_url') + '/chromium/deps/lighttpd.git@9dfa55d15937a688a92cbf2b7a8621b0927d06eb',
+ 'commit-queue':
+ Var('git_url') + '/chromium/tools/commit-queue.git@7779c66e03aa5b87a2d7354387b3d16338da9e29',
+ 'depot_tools':
+ Var('git_url') + '/chromium/tools/depot_tools.git@97231b5fb51556cdb5507b516284f3dab7e83a87',
+ 'src':
+ Var('git_url') + '/chromium/src.git@a3d215ec60d3a3f1e9316e240d4b14d2a28426fc',
'src/breakpad/src':
Var('git_url') + '/external/google-breakpad/src.git@f6a39aeb95a35bde6eb8fb1f2c130f9fa6f6b33f',
'src/chrome/browser/resources/pdf/html_office':
@@ -40,7 +56,7 @@ 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/WebKit/LayoutTests/w3c/csswg-test':
Var('git_url') + '/external/w3c/csswg-test.git@8c415e3215a203fa3a22dbdd1799279fdf44c81e',
'src/third_party/WebKit/LayoutTests/w3c/web-platform-tests':
@@ -58,7 +74,7 @@ deps = {
'src/third_party/cld_2/src':
Var('git_url') + '/external/cld2.git@e46695760d1ba1026a01e486907380bc466a03c1',
'src/third_party/ffmpeg':
- Var('git_url') + '/chromium/third_party/ffmpeg.git' + Var('ffmpeg_hash'),
+ Var('git_url') + '/chromium/deps/ffmpeg.git@427e1d5dfbea2b635829b6a66fb6a6308da97719',
'src/third_party/flac':
Var('git_url') + '/chromium/deps/flac.git@71e33f190a7bb144fe4e2014897b8d15c8247198',
'src/third_party/hunspell':
@@ -164,6 +180,8 @@ deps = {
deps_os = {
'android':
{
+ 'src/pdf':
+ None,
'src/third_party/android_tools':
Var('git_url') + '/android_tools.git@ca35676f4f652fa97964c488313720f55efd4405',
'src/third_party/aosp':
@@ -297,7 +315,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@78cf441c4ed0727b7bdadd63818e529898c3e4dd',
+ Var('git_url') + '/chromium/reference_builds/chrome.git@1add884151176e42ddb946b68530e61c971ee3fa',
'src/third_party/google_toolbox_for_mac/src':
Var('git_url') + '/external/google-toolbox-for-mac.git@704fb56df6a9a0884801045a158e021945d9d991',
'src/third_party/lighttpd':
@@ -311,8 +329,12 @@ deps_os = {
},
'unix':
{
+ 'build/third_party/cbuildbot_chromite':
+ Var('git_url') + '/chromiumos/chromite.git@28cc46bec6541ea98d703367a7402a6b8f4515d2',
+ '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@5186d1b279358de0d9a581399281f2268932cd37',
+ Var('git_url') + '/chromium/reference_builds/chrome.git@1add884151176e42ddb946b68530e61c971ee3fa',
'src/third_party/chromite':
Var('git_url') + '/chromiumos/chromite.git@473f7ab6baf1781618f379a7680b56048b5e0ec1',
'src/third_party/cros_dbus_cplusplus/source':
@@ -345,7 +367,7 @@ deps_os = {
'win':
{
'src/chrome/tools/test/reference_build/chrome_win':
- Var('git_url') + '/chromium/reference_builds/chrome_win.git@126d11ec7462975e6f073214929fca0f3c54756e',
+ 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':