summaryrefslogtreecommitdiffstats
path: root/.DEPS.git
diff options
context:
space:
mode:
Diffstat (limited to '.DEPS.git')
-rw-r--r--.DEPS.git126
1 files changed, 96 insertions, 30 deletions
diff --git a/.DEPS.git b/.DEPS.git
index c61a0bf..160bbe5 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':
- '@82ae69cc47f25f9a59cf2ca8742e3391c34e7602',
'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':
- '@a00af398f671537bc29802b6f1cb830927b17826'
+ '@bdfe7b376e01b5bf84421ffb018a545af41d7a67',
+ 'angle_revision':
+ '860ad3946c0824ee7cb75622df5408307851c28b'
}
deps = {
+ 'build':
+ Var('git_url') + '/chromium/tools/build.git@4b25d84f33f2a57ed68b4ed785a84cd8c235a788',
+ '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@34c6891b3c48799de96ac961d4902de69b1ec591',
+ 'commit-queue':
+ Var('git_url') + '/chromium/tools/commit-queue.git@4f13e8dd023d48d4f682ebf9d1dbe2361f1d9392',
+ 'depot_tools':
+ Var('git_url') + '/chromium/tools/depot_tools.git@e6ce537fdc7d4a4abd924f778b0570703798bf2d',
+ 'src':
+ Var('git_url') + '/chromium/src.git@187ed663855cb3d66771e96100f1a03054739fe4',
'src/breakpad/src':
Var('git_url') + '/external/google-breakpad/src.git@4f71cf97bb284016143c7e06963d2f455479d0da',
'src/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin':
@@ -28,7 +48,7 @@ deps = {
'src/googleurl':
Var('git_url') + '/external/google-url.git@ae822b39a0665aaca689c164305fd1690e36ae16',
'src/native_client':
- Var('git_url') + '/native_client/src/native_client.git@6f5964f306dd0bac1234ff9e868a28919a9811ef',
+ Var('git_url') + '/native_client/src/native_client.git@e5ff51a8759e7ebce1d391789663b205ed1f9ff3',
'src/sandbox/linux/seccomp-legacy':
Var('git_url') + '/external/seccompsandbox.git@91baa6234536b66149ba576d0e6c0506c3b3d2e3',
'src/sdch/open-vcdiff':
@@ -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@c77344d0d39b2365775b8e1d86bafcd5ac407444',
'src/third_party/angle':
- Var('git_url') + '/external/angleproject.git@860ad3946c0824ee7cb75622df5408307851c28b',
+ 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@c87f16b6cae0fc6647a15f0462f9ad173d05a39f',
+ Var('git_url') + '/external/google-cache-invalidation-api/src.git@a74b60eaa346bcec91cdbc227335c7ed34f80e8e',
'src/third_party/ffmpeg':
- Var('git_url') + '/chromium/third_party/ffmpeg.git' + Var('ffmpeg_hash'),
+ Var('git_url') + '/chromium/deps/ffmpeg.git@3f346935b249d113650d2d69483c27e55c4bbf1f',
'src/third_party/flac':
Var('git_url') + '/chromium/deps/flac.git@2ebf90f8beccb0fdbbf1cf3c39eac02280730d6d',
'src/third_party/hunspell':
@@ -56,13 +76,13 @@ deps = {
'src/third_party/hunspell_dictionaries':
Var('git_url') + '/chromium/deps/hunspell_dictionaries.git@7bdf407adf3dfdb31425a3617e9684f6adfaf5f4',
'src/third_party/icu':
- Var('git_url') + '/chromium/deps/icu46.git@35e00e4a09eb84db0900dba7fc61c8108b61b6d4',
+ Var('git_url') + '/chromium/deps/icu46.git@c48fde4c2edcd765956ff5ddd4312b0a7356f7aa',
'src/third_party/jsoncpp/source/include':
Var('git_url') + '/external/jsoncpp/jsoncpp/include.git@b0dd48e02b6e6248328db78a65b5c601f150c349',
'src/third_party/jsoncpp/source/src/lib_json':
Var('git_url') + '/external/jsoncpp/jsoncpp/src/lib_json.git@a8caa51ba2f80971a45880425bf2ae864a786784',
'src/third_party/leveldatabase/src':
- Var('git_url') + '/external/leveldb.git@29c68f16466b1704dc7a663cf51bf9c5579830c3',
+ Var('git_url') + '/external/leveldb.git@85e27d04530c0323957f28c3f47a7d9f6efeceb0',
'src/third_party/libexif/sources':
Var('git_url') + '/chromium/deps/libexif/sources.git@d815c325bab0d1871d4c7e70600ecdfdab07db9e',
'src/third_party/libjingle/source':
@@ -82,7 +102,7 @@ deps = {
'src/third_party/libyuv':
Var('git_url') + '/external/libyuv.git@95730719503137a7db61a105bec02220f9ed159e',
'src/third_party/opus/src':
- Var('git_url') + '/chromium/deps/opus.git@660e25f9ad9e0b421241dcf675c6883fecb859cd',
+ Var('git_url') + '/chromium/deps/opus.git@79181daa729bbfd77c8bf51dbcac8aac1593ccba',
'src/third_party/ots':
Var('git_url') + '/external/ots.git@54380c8e93060a771a2b4bf608e6d7160b3a71e4',
'src/third_party/pyftpdlib/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@e6a465861ec453b9bbc6ff49002558779c5c69c3',
+ Var('git_url') + '/external/skia/gyp.git@dc57db276ec826142a09d0e4bda08db99794e8f1',
'src/third_party/skia/include':
- Var('git_url') + '/external/skia/include.git@cce9159a393953f072d962a749f8424c69999fa2',
+ Var('git_url') + '/external/skia/include.git@c678a27e798f3894afb26874dc6e855187a6490d',
'src/third_party/skia/src':
- Var('git_url') + '/external/skia/src.git@b3d27947ea9425eec87e68b3cb4ad2dd074c421f',
+ Var('git_url') + '/external/skia/src.git@fa418764174d2703e401b66246af292f0eaa9e12',
'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@4aeb73620f2fb43b0906c294b19554391f7ec1a8',
'src/third_party/webrtc':
- Var('git_url') + '/external/webrtc/stable/webrtc.git@47e84a7c0ea12c37b32ff8d45384d98e75a49869',
+ Var('git_url') + '/external/webrtc/trunk/webrtc.git@6d31e7166b7057bacd0744f87bbc4440acbefab1',
'src/third_party/yasm/source/patched-yasm':
Var('git_url') + '/chromium/deps/yasm/patched-yasm.git@c960eb11ccda80b10ed50be39df4f0663b371d1d',
'src/tools/deps2git':
@@ -132,13 +152,13 @@ deps = {
'src/tools/grit':
Var('git_url') + '/external/grit-i18n.git@376fd9b1ffd91cfad9a4a7006a5218bc1ab4e652',
'src/tools/gyp':
- Var('git_url') + '/external/gyp.git@ee3aad419712c8d9648695a8c716560329599624',
+ Var('git_url') + '/external/gyp.git@472e93085f9efa1acb1d777382c2265163af4cce',
'src/tools/page_cycler/acid3':
Var('git_url') + '/chromium/deps/acid3.git@6be0a66a1ebd7ebc5abc1b2f405a945f6d871521',
'src/tools/swarm_client':
Var('git_url') + '/chromium/tools/swarm_client.git@34c6891b3c48799de96ac961d4902de69b1ec591',
'src/v8':
- Var('git_url') + '/external/v8.git@0ae265a5e7d444ff9765a53f08af0e69f34e035d',
+ Var('git_url') + '/external/v8.git@50bd32b042e7c817b9a240ef679bf950820f702e',
'src/webkit/media/crypto/ppapi/cdm':
Var('git_url') + '/chromium/cdm.git@c5062e0e6fc7cf180edea8d74442b72a05427cd8',
}
@@ -146,6 +166,44 @@ 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@704c8ddee726aabe0e78bb88545972d2cf298190',
'src/third_party/aosp':
@@ -168,6 +226,12 @@ deps_os = {
Var('git_url') + '/chromium/deps/jarjar.git@2e1ead4c68c450e0b77fe49e3f9137842b8b6920',
'src/third_party/jsr-305/src':
Var('git_url') + '/external/jsr-305.git@642c508235471f7220af6d5df2d3210e3bfc0919',
+ 'src/third_party/skia/gyp':
+ Var('git_url') + '/external/skia/gyp.git@ae5359b074bdb438d64175097a911211dc799c7d',
+ 'src/third_party/skia/include':
+ Var('git_url') + '/external/skia/include.git@773b9faeb3a56d8d15179f11b6c91592998aa60a',
+ 'src/third_party/skia/src':
+ Var('git_url') + '/external/skia/src.git@01564d2ef8983485b8c4497199641e1f86c198f1',
},
'ios':
{
@@ -231,10 +295,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@95cdcb2a365c00b555ad6586675c81b2e892fd92',
- 'src/third_party/WebKit/Source/WebKit/chromium/public':
- Var('git_url') + '/external/WebKit/Source/WebKit/chromium/public.git@7c467941c169461b23eaa28f632de0d961139972',
'src/third_party/WebKit/Tools/DumpRenderTree':
None,
'src/third_party/WebKit/Tools/Scripts':
@@ -276,7 +336,7 @@ deps_os = {
'src/third_party/libyuv':
None,
'src/third_party/nss':
- Var('git_url') + '/chromium/deps/nss.git@8ad9ab9b88c274e6b1f529460d57dc0aa44eec47',
+ Var('git_url') + '/chromium/deps/nss.git@649d7840f0addc7179f4a030fadeb77fad4f7bc2',
'src/third_party/ots':
None,
'src/third_party/pylib':
@@ -319,13 +379,13 @@ 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':
Var('git_url') + '/chromium/deps/lighttpd.git@9dfa55d15937a688a92cbf2b7a8621b0927d06eb',
'src/third_party/nss':
- Var('git_url') + '/chromium/deps/nss.git@8ad9ab9b88c274e6b1f529460d57dc0aa44eec47',
+ Var('git_url') + '/chromium/deps/nss.git@649d7840f0addc7179f4a030fadeb77fad4f7bc2',
'src/third_party/pdfsqueeze':
Var('git_url') + '/external/pdfsqueeze.git@5936b871e6a087b7e50d4cbcb122378d8a07499f',
'src/third_party/swig/mac':
@@ -333,8 +393,14 @@ deps_os = {
},
'unix':
{
+ 'build/third_party/cbuildbot_chromite':
+ Var('git_url') + '/chromiumos/chromite.git@dc95ad73401f04e154ae04eca14b2db01c27863f',
+ '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':
@@ -357,9 +423,9 @@ 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/third_party/bison':
Var('git_url') + '/chromium/deps/bison.git@083c9a45e4affdd5464ee2b224c2df649c6e26c3',
'src/third_party/cygwin':
@@ -375,7 +441,7 @@ deps_os = {
'src/third_party/nacl_sdk_binaries':
Var('git_url') + '/chromium/deps/nacl_sdk_binaries.git@759dfca03bdc774da7ecbf974f6e2b84f43699a5',
'src/third_party/nss':
- Var('git_url') + '/chromium/deps/nss.git@8ad9ab9b88c274e6b1f529460d57dc0aa44eec47',
+ Var('git_url') + '/chromium/deps/nss.git@649d7840f0addc7179f4a030fadeb77fad4f7bc2',
'src/third_party/pefile':
Var('git_url') + '/external/pefile.git@d0ca75794f69f1d09fd6d31d40ba2f1e9b3b7fb4',
'src/third_party/perl':