summaryrefslogtreecommitdiffstats
path: root/.DEPS.git
diff options
context:
space:
mode:
Diffstat (limited to '.DEPS.git')
-rw-r--r--.DEPS.git148
1 files changed, 123 insertions, 25 deletions
diff --git a/.DEPS.git b/.DEPS.git
index 7c026ff..d877d0d 100644
--- a/.DEPS.git
+++ b/.DEPS.git
@@ -1,20 +1,40 @@
# 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':
- '@5ef9ec1c09371f72efecddfc4ba0be0a50870040',
'webkit_url':
- 'https://chromium.googlesource.com/external/WebKit_trimmed.git',
+ 'https://chromium.googlesource.com/chromium/blink.git',
'git_url':
'https://chromium.googlesource.com',
'webkit_rev':
- '@565b83f91339dc86fb6ef516e4b2d3e19bd4135a'
+ '@4d9c832d400788ea8e0692df2cd89e35cc48eb6f',
+ 'angle_revision':
+ '31ea86959d740e67fbb20ec1ab356999301b153c'
}
deps = {
+ 'build':
+ Var('git_url') + '/chromium/tools/build.git@d92f21703cb3a77b4da3d3047fec58e0ad994959',
+ '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@9ae728620c0d79010c294c275698626d22bc1186',
+ 'commit-queue':
+ Var('git_url') + '/chromium/tools/commit-queue.git@cf82d4925a26757222870c9df3d4d5f896fec2cc',
+ 'depot_tools':
+ Var('git_url') + '/chromium/tools/depot_tools.git@6683ab4c49dd5da5dd602024e246a68acf6dbbcf',
+ 'src':
+ Var('git_url') + '/chromium/src.git@b916744984908b4f16a1d9a1a9a518bfefc921d6',
'src/breakpad/src':
Var('git_url') + '/external/google-breakpad/src.git@f3f050cd97ad86fac2700ef9ca98bd9f0319d304',
'src/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin':
@@ -38,17 +58,17 @@ deps = {
'src/testing/gtest':
Var('git_url') + '/external/googletest.git@a6772271f71672e889776bfe49ec4efd9da036df',
'src/third_party/WebKit':
- Var('webkit_url') + Var('webkit_rev'),
+ Var('git_url') + '/external/WebKit_trimmed.git' + Var('webkit_rev'),
'src/third_party/accessibility-developer-tools':
Var('git_url') + '/external/accessibility-developer-tools.git@ad5df9a5341d38778658c90e4aa241c4ebe4e8aa',
'src/third_party/angle':
- Var('git_url') + '/external/angleproject.git@31ea86959d740e67fbb20ec1ab356999301b153c',
+ Var('git_url') + '/external/angleproject.git' + '@' + Var('angle_revision'),
'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@17a06250fa53859092cd6ee30c5039adfaa5a071',
+ Var('git_url') + '/external/google-cache-invalidation-api/src.git@5548083fa6f293bd5fdb0a627313bb8bdd8bbed2',
'src/third_party/ffmpeg':
- Var('git_url') + '/chromium/third_party/ffmpeg.git' + Var('ffmpeg_hash'),
+ Var('git_url') + '/chromium/deps/ffmpeg.git@6da952826bdecf712bced91d7b8a38e818aa063c',
'src/third_party/flac':
Var('git_url') + '/chromium/deps/flac.git@78a2e692ecce084e1bb2cd6fde2d44eae2045f0b',
'src/third_party/hunspell':
@@ -78,7 +98,7 @@ deps = {
'src/third_party/libsrtp':
Var('git_url') + '/chromium/deps/libsrtp.git@aaa7ffc69828e8202a549268f5ac7fe428232811',
'src/third_party/libvpx':
- Var('git_url') + '/chromium/deps/libvpx.git@fa43a22c16ae2b81f2532c907fb9eb2c1cd2a373',
+ Var('git_url') + '/chromium/deps/libvpx.git@1a56a960efec162d5c45886b735c911a0c7216e6',
'src/third_party/libyuv':
Var('git_url') + '/external/libyuv.git@a9c9242a557c0202454733bab66521bff2e35fc9',
'src/third_party/opus/src':
@@ -98,11 +118,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@fe4f566a6c8cd5aa23f34cece2f85c61fd68cbdc',
+ Var('git_url') + '/external/skia/gyp.git@5126d37b4231bb5a89abac8542b6c4059da7b06d',
'src/third_party/skia/include':
- Var('git_url') + '/external/skia/include.git@9a733cd589fcc97e7479cd70030cb95fe9512b98',
+ Var('git_url') + '/external/skia/include.git@a79635f1afb3a83d5ff2c88317b80dcf31fa6ab7',
'src/third_party/skia/src':
- Var('git_url') + '/external/skia/src.git@6226221f2c2b6f9584463b741bfe49d8601ddf75',
+ Var('git_url') + '/external/skia/src.git@40a9f90a044b23eda9c8b36ec86eb8d4de57afa0',
'src/third_party/smhasher/src':
Var('git_url') + '/external/smhasher.git@e813f9b95be7adad5a2e441f4484278c453e5261',
'src/third_party/snappy/src':
@@ -124,7 +144,7 @@ deps = {
'src/third_party/webpagereplay':
Var('git_url') + '/external/web-page-replay.git@5dffb5f7dc1557ff6abdb1b99bbbf98fedee3a14',
'src/third_party/webrtc':
- Var('git_url') + '/external/webrtc/stable/webrtc.git@b259aab88b45c5d15e994616347a7ae5774dae00',
+ Var('git_url') + '/external/webrtc/trunk/webrtc.git@e859cc1cfb791d632bd3d4b223ebdd2dda35580c',
'src/third_party/yasm/source/patched-yasm':
Var('git_url') + '/chromium/deps/yasm/patched-yasm.git@c960eb11ccda80b10ed50be39df4f0663b371d1d',
'src/tools/deps2git':
@@ -138,7 +158,7 @@ deps = {
'src/tools/swarm_client':
Var('git_url') + '/chromium/tools/swarm_client.git@9ae728620c0d79010c294c275698626d22bc1186',
'src/v8':
- Var('git_url') + '/external/v8.git@ac36071c9ef7e9284b15e25826dd7efb34157234',
+ Var('git_url') + '/external/v8.git@47ecd7a554f1d55341f7238b865b836aacaf9829',
'src/webkit/media/crypto/ppapi/cdm':
Var('git_url') + '/chromium/cdm.git@c2b192a02546916d28233cfd8b7717ffcdcc8347',
}
@@ -146,8 +166,46 @@ deps = {
deps_os = {
'android':
{
+ 'src/content/test/data/layout_tests/LayoutTests/fast/events':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/fast/files':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/fast/filesystem/resources':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/fast/js/resources':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/fast/workers':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/http/tests/appcache':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/http/tests/resources':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/http/tests/websocket/tests':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/http/tests/workers':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/http/tests/xmlhttprequest':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/media':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/platform/chromium-win/fast/events':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/platform/chromium-win/fast/workers':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/platform/chromium-win/http/tests/workers':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/platform/chromium-win/storage/domstorage':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/platform/chromium/fast/events':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/storage/domstorage':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/storage/indexeddb':
+ None,
+ 'src/third_party/WebKit/LayoutTests':
+ None,
'src/third_party/android_tools':
- Var('git_url') + '/android_tools.git@c92dbd7072f264fc90434221b01ab093f807bba6',
+ Var('git_url') + '/android_tools.git@4745ecc25a0a36c24e355ee3e6bd87f63b6a48c7',
'src/third_party/aosp':
Var('git_url') + '/chromium/deps/aosp.git@bbafe5155dff86bbba1e92b42a073ffcfcfbf28c',
'src/third_party/apache-mime4j':
@@ -233,10 +291,6 @@ deps_os = {
None,
'src/third_party/WebKit/Source':
None,
- 'src/third_party/WebKit/Source/Platform/chromium/public':
- Var('git_url') + '/external/WebKit/Source/Platform/chromium/public.git@cb8b613dab2af2675346eee85963524fd8eaf468',
- 'src/third_party/WebKit/Source/WebKit/chromium/public':
- Var('git_url') + '/external/WebKit/Source/WebKit/chromium/public.git@e6e9228aa57eef4d0dc2ec2d8fa80e9f957b083b',
'src/third_party/WebKit/Tools/DumpRenderTree':
None,
'src/third_party/WebKit/Tools/Scripts':
@@ -315,7 +369,7 @@ deps_os = {
'src/chrome/installer/mac/third_party/xz/xz':
Var('git_url') + '/chromium/deps/xz.git@604fa85cc4e214aa0f418a2596ea865c0eed7a54',
'src/chrome/tools/test/reference_build/chrome_mac':
- Var('git_url') + '/chromium/reference_builds/chrome_mac.git@b43b0539e14bf908e771dbbf0b080f7dc9b75219',
+ Var('git_url') + '/chromium/reference_builds/chrome.git@1add884151176e42ddb946b68530e61c971ee3fa',
'src/third_party/GTM':
Var('git_url') + '/external/google-toolbox-for-mac.git@6ea10b5e00258b98e91a9c9067f524c3e2cda252',
'src/third_party/lighttpd':
@@ -329,12 +383,18 @@ deps_os = {
},
'unix':
{
+ 'build/third_party/cbuildbot_chromite':
+ Var('git_url') + '/chromiumos/chromite.git@1b79304f94fb41799ab59f488c14baf2d4fcc935',
+ '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@53d4cfaf7032086779f2f4f40a9b6f21b7dbc3bf',
+ Var('git_url') + '/chromium/reference_builds/chrome.git@1add884151176e42ddb946b68530e61c971ee3fa',
'src/third_party/cros_dbus_cplusplus/source':
Var('git_url') + '/chromiumos/third_party/dbus-cplusplus.git@5e8f6d9db5c2abfb91d91f751184f25bb5cd0900',
'src/third_party/cros_system_api':
- Var('git_url') + '/chromiumos/platform/system_api.git@f1fccbe00f2e161da74ccb2776ab9d961b15259d',
+ Var('git_url') + '/chromiumos/platform/system_api.git@6e9dab2c1c97a3b5a0a99353458d5c1a173bbc75',
'src/third_party/gold':
Var('git_url') + '/chromium/deps/gold.git@74c34c19eadc0135b189318e393e78ca1dd431aa',
'src/third_party/libmtp':
@@ -353,9 +413,47 @@ deps_os = {
'win':
{
'src/chrome/tools/test/reference_build/chrome_win':
- Var('git_url') + '/chromium/reference_builds/chrome_win.git@fc239c7dcabcd2a225c281963eedb6a5441fb13b',
+ 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/content/test/data/layout_tests/LayoutTests/fast/events':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/fast/files':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/fast/filesystem/resources':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/fast/js/resources':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/fast/workers':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/http/tests/appcache':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/http/tests/resources':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/http/tests/websocket/tests':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/http/tests/workers':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/http/tests/xmlhttprequest':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/media':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/platform/chromium-win/fast/events':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/platform/chromium-win/fast/workers':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/platform/chromium-win/http/tests/workers':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/platform/chromium-win/storage/domstorage':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/platform/chromium/fast/events':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/storage/domstorage':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/storage/indexeddb':
+ None,
+ 'src/third_party/WebKit/LayoutTests':
+ None,
'src/third_party/bison':
Var('git_url') + '/chromium/deps/bison.git@083c9a45e4affdd5464ee2b224c2df649c6e26c3',
'src/third_party/cygwin':