summaryrefslogtreecommitdiffstats
path: root/.DEPS.git
diff options
context:
space:
mode:
Diffstat (limited to '.DEPS.git')
-rw-r--r--.DEPS.git62
1 files changed, 43 insertions, 19 deletions
diff --git a/.DEPS.git b/.DEPS.git
index 0745a66..d0c4b69 100644
--- a/.DEPS.git
+++ b/.DEPS.git
@@ -1,20 +1,38 @@
# 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':
- '@245a8c0cdfdd5ab3da9045089661017e9ddd8d0e',
'webkit_url':
'https://chromium.googlesource.com/chromium/blink.git',
'git_url':
'https://chromium.googlesource.com',
'webkit_rev':
- '@204fed49d403a3623e92061b46ce2951d0d1cdf7'
+ '@a1e355f8c0ba96ad9d6b55138c89080f3d58d61c'
}
deps = {
+ 'build':
+ Var('git_url') + '/chromium/tools/build.git@44cb520bc787641f9007e274a077022d891d4f21',
+ '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',
+ 'build/third_party/swarm_client':
+ Var('git_url') + '/chromium/tools/swarm_client.git@75584e2e2a130fa12d7ad0b96d2abdeb71c1ca41',
+ 'commit-queue':
+ Var('git_url') + '/chromium/tools/commit-queue.git@4e57a06e7e8afbb032b5e6f569141fa3e1c50a94',
+ 'depot_tools':
+ Var('git_url') + '/chromium/tools/depot_tools.git@acb9ed7d8f65a03cf203ce83462221c2c5b0101e',
+ 'src':
+ Var('git_url') + '/chromium/src.git@8023cf40308fe33b9bba81d9e59ac36379a9d551',
'src/breakpad/src':
Var('git_url') + '/external/google-breakpad/src.git@1db182dbc2d31c730a2076d675a2e3fd1e106453',
'src/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin':
@@ -36,7 +54,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@ad5df9a5341d38778658c90e4aa241c4ebe4e8aa',
'src/third_party/angle_dx11':
@@ -46,15 +64,15 @@ deps = {
'src/third_party/cacheinvalidation/src':
Var('git_url') + '/external/google-cache-invalidation-api/src.git@7f2db96c800ac833fba9af7b446feb3fd73bd9e6',
'src/third_party/ffmpeg':
- Var('git_url') + '/chromium/third_party/ffmpeg.git' + Var('ffmpeg_hash'),
+ Var('git_url') + '/chromium/deps/ffmpeg.git@cd6e37f85fa0463c27a950ef99be8688c72d24db',
'src/third_party/flac':
Var('git_url') + '/chromium/deps/flac.git@92306ca4073ee0a9df9dc4a87e40a7b3fd595d02',
'src/third_party/hunspell':
- Var('git_url') + '/chromium/deps/hunspell.git@b7195d9c26be6dac1d236023189f366a9c750083',
+ Var('git_url') + '/chromium/deps/hunspell.git@37403978cd939a2b396a5d49944af54623e4795e',
'src/third_party/hunspell_dictionaries':
- Var('git_url') + '/chromium/deps/hunspell_dictionaries.git@a078a87551eb3e36e74cf3c550e69c4be7ad7da7',
+ Var('git_url') + '/chromium/deps/hunspell_dictionaries.git@bc7edb352e97fa71e387b9a5522f1bbd5b11a5eb',
'src/third_party/icu':
- Var('git_url') + '/chromium/deps/icu46.git@7db4750b5716130b07ca503840fa4bd0a73ffbd3',
+ Var('git_url') + '/chromium/deps/icu46.git@5e7758b8717448753723809ef48b37e991d88af9',
'src/third_party/jsoncpp/source/include':
Var('git_url') + '/external/jsoncpp/jsoncpp/include.git@b0dd48e02b6e6248328db78a65b5c601f150c349',
'src/third_party/jsoncpp/source/src/lib_json':
@@ -98,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@42a8cdd9c32bc9092f36d94213fae944ddc9fe18',
+ Var('git_url') + '/external/skia/gyp.git@c328e26a9e3bd490ff5c99b70e31b41dc93fcca2',
'src/third_party/skia/include':
- Var('git_url') + '/external/skia/include.git@96fb66f805df55858b577f6637c4c25b981d14a4',
+ Var('git_url') + '/external/skia/include.git@a5a80641e43b092ec00d12eb514430a57d3f7210',
'src/third_party/skia/src':
- Var('git_url') + '/external/skia/src.git@b0caa76bd3b8e29ea3aee738efea1992250f82fc',
+ Var('git_url') + '/external/skia/src.git@d9b5900f08b760779a373168ccc526385f4e14bf',
'src/third_party/smhasher/src':
Var('git_url') + '/external/smhasher.git@6f63a4882e6b2cf87e8eec1a3ef8644e0d963283',
'src/third_party/snappy/src':
@@ -124,7 +142,7 @@ deps = {
'src/third_party/webpagereplay':
Var('git_url') + '/external/web-page-replay.git@3ff7ff0fe870310f143fa9cd7a06be270cb66f76',
'src/third_party/webrtc':
- Var('git_url') + '/external/webrtc/stable/webrtc.git@27dd2aa2882155f2eec33619793534cd7afd8e6e',
+ Var('git_url') + '/external/webrtc/trunk/webrtc.git@acf00818c0961c3d4f0c49598b1ff665335ff017',
'src/third_party/yasm/source/patched-yasm':
Var('git_url') + '/chromium/deps/yasm/patched-yasm.git@c960eb11ccda80b10ed50be39df4f0663b371d1d',
'src/tools/deps2git':
@@ -138,7 +156,7 @@ deps = {
'src/tools/swarm_client':
Var('git_url') + '/chromium/tools/swarm_client.git@53f8d5a2d9de5904c9d455fcba7a8af3e5a10e96',
'src/v8':
- Var('git_url') + '/external/v8.git@db6c80e9dfa14411c3f8d2f848633dae39b9a2dc',
+ Var('git_url') + '/external/v8.git@eae24e48577660a4d7e2243cf3c4a8f65ed0f36e',
'src/webkit/renderer/media/crypto/ppapi/cdm':
Var('git_url') + '/chromium/cdm.git@c2b192a02546916d28233cfd8b7717ffcdcc8347',
}
@@ -267,7 +285,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@4c3f8cbeff8525e43710bc655bcf455546b9261d',
+ Var('git_url') + '/chromium/reference_builds/chrome.git@1add884151176e42ddb946b68530e61c971ee3fa',
'src/third_party/GTM':
Var('git_url') + '/external/google-toolbox-for-mac.git@1f3578bb9c3cfdf1293f106f07e5b0b3e19ae543',
'src/third_party/lighttpd':
@@ -281,8 +299,14 @@ deps_os = {
},
'unix':
{
+ 'build/third_party/cbuildbot_chromite':
+ Var('git_url') + '/chromiumos/chromite.git@5dc9a9dace7cbbf7eba0d4314bbb764d064d88ae',
+ 'build/third_party/xvfb':
+ Var('git_url') + '/chromium/tools/third_party/xvfb.git@aebb1aadf1422e4d81e831e13746b8f7ae322e07',
+ 'build/xvfb':
+ Var('git_url') + '/chromium/tools/xvfb.git@077af3535e54dbb782a355b81ba69ea17ec6bde5',
'src/chrome/tools/test/reference_build/chrome_linux':
- Var('git_url') + '/chromium/reference_builds/chrome_linux.git@216cf5b1b3e97e285e0ee361f54e8f7a30c6af00',
+ Var('git_url') + '/chromium/reference_builds/chrome.git@1add884151176e42ddb946b68530e61c971ee3fa',
'src/third_party/chromite':
Var('git_url') + '/chromiumos/chromite.git@785fedc51fc430445d8f397440012ea3b489bac9',
'src/third_party/cros_dbus_cplusplus/source':
@@ -313,13 +337,13 @@ deps_os = {
'win':
{
'src/chrome/tools/test/reference_build/chrome_win':
- Var('git_url') + '/chromium/reference_builds/chrome_win.git@9dc219619d7ec297d70881167987057c74953081',
+ 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@66c68f08ba18a17887f8f727a21d9106ab4b6c02',
+ 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':
- Var('git_url') + '/chromium/deps/cygwin.git@2fe44d1878e9d989ac46f09364752f633e171e7d',
+ Var('git_url') + '/chromium/deps/cygwin.git@3711a17ddd629317f40676bdcc564f32fd7a4fd2',
'src/third_party/gnu_binutils':
Var('git_url') + '/native_client/deps/third_party/gnu_binutils.git@f4003433b61b25666565690caf3d7a7a1a4ec436',
'src/third_party/gperf':