summaryrefslogtreecommitdiffstats
path: root/.DEPS.git
diff options
context:
space:
mode:
Diffstat (limited to '.DEPS.git')
-rw-r--r--.DEPS.git60
1 files changed, 41 insertions, 19 deletions
diff --git a/.DEPS.git b/.DEPS.git
index e7a23fb..2b87164 100644
--- a/.DEPS.git
+++ b/.DEPS.git
@@ -1,20 +1,36 @@
# 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':
- '@5879ccd47e649bf2dfaec45f02ec5517bd3621d2',
'webkit_url':
'https://chromium.googlesource.com/chromium/blink.git',
'git_url':
'https://chromium.googlesource.com',
'webkit_rev':
- '@caa0000e9d54c3233b2b20a981fbd80e15fc70d7'
+ '@687f07d8b693a86d01b4764a3fdf675f65012df2'
}
deps = {
+ 'build':
+ Var('git_url') + '/chromium/tools/build.git@ad73333cde6abdfe075d19576c972038bfb2320f',
+ '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@2db110c378b7b5b42568befe14c8549e1ee3361d',
+ 'depot_tools':
+ Var('git_url') + '/chromium/tools/depot_tools.git@c7a9efad97c608b7604604ca0f5447dc8c049ad3',
+ 'src':
+ Var('git_url') + '/chromium/src.git@0b5a8ba42a8702da83d2fa3e2a3b24058b0243cb',
'src/breakpad/src':
Var('git_url') + '/external/google-breakpad/src.git@f753127663fb164b0b61a147cb93bbca496e1166',
'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/accessibility-developer-tools':
Var('git_url') + '/external/accessibility-developer-tools.git@2e3c9c8e49277a0ca1eeba510271eb03f9486d8f',
'src/third_party/angle_dx11':
@@ -44,11 +60,11 @@ deps = {
'src/third_party/bidichecker':
Var('git_url') + '/external/bidichecker/lib.git@97f2aa645b74c28c57eca56992235c79850fa9e0',
'src/third_party/cacheinvalidation/src':
- Var('git_url') + '/external/google-cache-invalidation-api/src.git@1ea5629c3d190998a24a14ffb58193e109b71855',
+ Var('git_url') + '/external/google-cache-invalidation-api/src.git@97e793b9ed009500acebfbc995ab06cdd47a32f1',
'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@a7e247c7ecc98efafa53de42c1b537d80555b7ee',
'src/third_party/flac':
Var('git_url') + '/chromium/deps/flac.git@71e33f190a7bb144fe4e2014897b8d15c8247198',
'src/third_party/hunspell':
@@ -68,7 +84,7 @@ deps = {
'src/third_party/libjingle/source/talk':
Var('git_url') + '/external/webrtc/stable/talk.git@3a6035d31f360cb7a9420b7934176494b09721b3',
'src/third_party/libjpeg_turbo':
- Var('git_url') + '/chromium/deps/libjpeg_turbo.git@82ce8a6d4ebe12a177c0c3597192f2b4f09e81c3',
+ Var('git_url') + '/chromium/deps/libjpeg_turbo.git@32cab49bd4cb1ce069a435fd75f9439c34ddc6f8',
'src/third_party/libphonenumber/src/phonenumbers':
Var('git_url') + '/external/libphonenumber/cpp/src/phonenumbers.git@c636308f0ab6fb1af7589eaf0917103dc22fa61e',
'src/third_party/libphonenumber/src/resources':
@@ -100,11 +116,11 @@ deps = {
'src/third_party/sfntly/cpp/src':
Var('git_url') + '/external/sfntly/cpp/src.git@cfb2f1743f0169ad8d01035458617bce97107539',
'src/third_party/skia/gyp':
- Var('git_url') + '/external/skia/gyp.git@f186dad96e7c98490db4850f0fe335ea32f51758',
+ Var('git_url') + '/external/skia/gyp.git@271d71a2a21682a2d19305aa973e470a0c2b38d0',
'src/third_party/skia/include':
- Var('git_url') + '/external/skia/include.git@490be8e4386dd93431d4e4e679870fed7eb71d28',
+ Var('git_url') + '/external/skia/include.git@5d047779f76d8d3d05b40438f22aa18cf4080433',
'src/third_party/skia/src':
- Var('git_url') + '/external/skia/src.git@553b8505a7e06e810707c2b8e2d74326b18ec85c',
+ Var('git_url') + '/external/skia/src.git@60d823a67c23cb1fc0d15bf971eea14dc814a777',
'src/third_party/smhasher/src':
Var('git_url') + '/external/smhasher.git@6f63a4882e6b2cf87e8eec1a3ef8644e0d963283',
'src/third_party/snappy/src':
@@ -124,7 +140,7 @@ deps = {
'src/third_party/webpagereplay':
Var('git_url') + '/external/web-page-replay.git@4bb19b79437f638749383e180f44722637c1aa65',
'src/third_party/webrtc':
- Var('git_url') + '/external/webrtc/stable/webrtc.git@496cc4b0a79cf30e5d1d449488327a0f1fbb517d',
+ Var('git_url') + '/external/webrtc/trunk/webrtc.git@916aa3aa35218428824b4d4af795b42ddf3b575b',
'src/third_party/yasm/source/patched-yasm':
Var('git_url') + '/chromium/deps/yasm/patched-yasm.git@c960eb11ccda80b10ed50be39df4f0663b371d1d',
'src/tools/deps2git':
@@ -138,12 +154,14 @@ deps = {
'src/tools/swarm_client':
Var('git_url') + '/chromium/tools/swarm_client.git@e9403abed8fc4720141325057190690e3ca329c6',
'src/v8':
- Var('git_url') + '/external/v8.git@27ce87485ab441498d1e5122df29234e01d0b945',
+ Var('git_url') + '/external/v8.git@5adfc94c1d5656af7f701a63203bb0009c936b13',
}
deps_os = {
'android':
{
+ 'src/pdf':
+ None,
'src/third_party/android_tools':
Var('git_url') + '/android_tools.git@e504b737693e96816b40e6ae80d177352c079c18',
'src/third_party/aosp':
@@ -169,7 +187,7 @@ deps_os = {
'src/third_party/lss':
Var('git_url') + '/external/linux-syscall-support/lss.git@e6c7682c40c27527894fbb8bcba38f77edbbb6b7',
'src/third_party/openssl':
- Var('git_url') + '/chromium/deps/openssl.git@8f54aac19a36d72ea630c813cae51c81a3cc0d78',
+ Var('git_url') + '/chromium/deps/openssl.git@46ff03e1e94c88fe1933b448311f4732a0d8ecc6',
},
'ios':
{
@@ -265,7 +283,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':
@@ -279,8 +297,12 @@ deps_os = {
},
'unix':
{
+ 'build/third_party/cbuildbot_chromite':
+ Var('git_url') + '/chromiumos/chromite.git@a5f56638ed7f2dfbff906a0b069140e5e4a1ea84',
+ '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':
@@ -298,7 +320,7 @@ deps_os = {
'src/third_party/mtpd/source':
Var('git_url') + '/chromiumos/platform/mtpd.git@5be739c938a0a229ba9479b00b180e1f9c843e81',
'src/third_party/openssl':
- Var('git_url') + '/chromium/deps/openssl.git@8f54aac19a36d72ea630c813cae51c81a3cc0d78',
+ Var('git_url') + '/chromium/deps/openssl.git@46ff03e1e94c88fe1933b448311f4732a0d8ecc6',
'src/third_party/pyelftools':
Var('git_url') + '/chromiumos/third_party/pyelftools.git@bdc1d380acd88d4bfaf47265008091483b0d614e',
'src/third_party/swig/linux':
@@ -311,9 +333,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':