diff --git a/DEPS b/DEPS index 3a2221a9..ab2d54bb 100644 --- a/DEPS +++ b/DEPS
@@ -32,13 +32,22 @@ # If you do not know, use the full path while defining your new deps entry. 'googlecode_url': 'http://%s.googlecode.com/svn', 'chromium_git': 'https://chromium.googlesource.com', - 'libvpx_revision': '70db2235b7e389f4d1b178320ebce76280c127af', - 'sfntly_revision': '1bdaae8fc788a5ac8936d68bf24f37d977a13dac', - 'skia_revision': 'c9e190ddac3d193e89e580ea3819a55c28f15e61', + # Three lines of non-changing comments so that + # the commit queue can handle CLs rolling libvpx + # and whatever else without interference from each other. + 'libvpx_revision': 'b33794b9132c8c1722206d6676c37177ccbaef2e', + # Three lines of non-changing comments so that + # the commit queue can handle CLs rolling sfntly + # and whatever else without interference from each other. + 'sfntly_revision': '130f832eddf98467e6578b548cb74ce17d04a26d', + # Three lines of non-changing comments so that + # the commit queue can handle CLs rolling Skia + # and whatever else without interference from each other. + 'skia_revision': '7b60c2cd1af1f5834a32fc7f68b2ce1e70d12613', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling V8 # and whatever else without interference from each other. - 'v8_revision': '40d687146a2c35b1328f21ea5f3b95b2be4dda52', + 'v8_revision': 'd31a63ae054e0bd17a7d3d078c3e347a9585ef8c', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling swarming_client # and whatever else without interference from each other. @@ -50,19 +59,19 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling build tools # and whatever else without interference from each other. - 'buildtools_revision': '8d89c1b15f80323b54b3305b2be7b26686fd5611', + 'buildtools_revision': '0c88009d5c50b9f21b6f8849db08abfb9eb29f1e', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling PDFium # and whatever else without interference from each other. - 'pdfium_revision': '6c5afa68ed4e21f9d0bfd1ecc01e824d946c5485', + 'pdfium_revision': '3e144b8c23d7c52ed36329e87f0cb01f38ec1ed7', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling openmax_dl # and whatever else without interference from each other. - 'openmax_dl_revision': '2eb98d819bed3082071a09268b886bc4496c6fb5', + 'openmax_dl_revision': '37b900ccc45cfab71faf4fd332df15369766b94c', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling BoringSSL # and whatever else without interference from each other. - 'boringssl_revision': '4c60d356a926b68ac20e8090755799e1525874f0', + 'boringssl_revision': '8c9b8783e26c3fbfc6d111017796256df6ea93dd', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling nss # and whatever else without interference from each other. @@ -157,8 +166,8 @@ 'src/native_client': Var('chromium_git') + '/native_client/src/native_client.git' + '@' + Var('nacl_revision'), - 'src/third_party/sfntly/cpp/src': - Var('chromium_git') + '/external/sfntly/cpp/src.git' + '@' + Var('sfntly_revision'), + 'src/third_party/sfntly/src': + Var('chromium_git') + '/external/github.com/googlei18n/sfntly.git' + '@' + Var('sfntly_revision'), 'src/third_party/skia': Var('chromium_git') + '/skia.git' + '@' + Var('skia_revision'), @@ -185,13 +194,13 @@ Var('chromium_git') + '/chromium/deps/libvpx.git' + '@' + Var('libvpx_revision'), 'src/third_party/libvpx_new/source/libvpx': - Var('chromium_git') + '/webm/libvpx.git' + '@' + '90a109f0eef8bfaaa4869cf7b2873dac5076b582', + Var('chromium_git') + '/webm/libvpx.git' + '@' + '7d28d12ef34f6cbb6b1e18f3b23b71392fd3ddf5', 'src/third_party/ffmpeg': - Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + 'dad5c1808dd2fafaa5ae43b8f7b1a2fe98bd06dd', + Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + 'cf1d457c7dfbcc65c26fad16baef881c7b0bab3a', 'src/third_party/libjingle/source/talk': - Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + 'e1e22ac3d7bd583fd61781800409122a245a2aee', # commit position 10081 + Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + 'c1f29d891d2d439060eff868e34935f69d454cca', # commit position 10116 'src/third_party/usrsctp/usrsctplib': Var('chromium_git') + '/external/usrsctplib.git' + '@' + '36444a999739e9e408f8f587cb4c3ffeef2e50ac', # from svn revision 9215 @@ -215,7 +224,7 @@ Var('chromium_git') + '/native_client/src/third_party/scons-2.0.1.git' + '@' + '1c1550e17fc26355d08627fbdec13d8291227067', 'src/third_party/webrtc': - Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + 'a6ae030b86e4ab27227ac43ed7d7d976214ffeed', # commit position 10081 + Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + 'd2b20e56b1e63d0d2fce3f9581753d91487744f6', # commit position 10117 'src/third_party/openmax_dl': Var('chromium_git') + '/external/webrtc/deps/third_party/openmax.git' + '@' + Var('openmax_dl_revision'), @@ -224,7 +233,7 @@ Var('chromium_git') + '/external/github.com/open-source-parsers/jsoncpp.git' + '@' + 'f572e8e42e22cfcf5ab0aea26574f408943edfa4', # from svn 248 'src/third_party/libyuv': - Var('chromium_git') + '/libyuv/libyuv.git' + '@' + '62c49dc811f078e78ed76bfd7c6358c8b7513a14', # from version 1487 + Var('chromium_git') + '/libyuv/libyuv.git' + '@' + 'd039ad6e9b49ce61afcb22968eb0d3771f019abc', # from version 1495 'src/third_party/smhasher/src': Var('chromium_git') + '/external/smhasher.git' + '@' + 'e87738e57558e0ec472b2fc3a643b838e5b6e88f', @@ -256,7 +265,7 @@ Var('chromium_git') + '/chromium/cdm.git' + '@' + '7377023e384f296cbb27644eb2c485275f1f92e8', # from svn revision 294518 'src/third_party/mesa/src': - Var('chromium_git') + '/chromium/deps/mesa.git' + '@' + '3918dbd3bced7843af396a0ee9f9da081d968806', + Var('chromium_git') + '/chromium/deps/mesa.git' + '@' + 'a3dc7d623fbb83a6246adf3d363922ad3909c14c', 'src/third_party/cld_2/src': Var('chromium_git') + '/external/github.com/CLD2Owners/cld2.git' + '@' + '84b58a5d7690ebf05a91406f371ce00c3daf31c0', @@ -388,7 +397,7 @@ # For Linux and Chromium OS. 'src/third_party/cros_system_api': - Var('chromium_git') + '/chromiumos/platform/system_api.git' + '@' + '0b175578c8150c7ee0e7e4fd6d4dc7480979e248', + Var('chromium_git') + '/chromiumos/platform/system_api.git' + '@' + '4a77577ef89e8a3f44d6604dc3a552e33bfa79e3', # Note that this is different from Android's freetype repo. 'src/third_party/freetype2/src': @@ -589,7 +598,7 @@ }, { # Update LASTCHANGE.blink. - 'name': 'lastchange', + 'name': 'lastchange_blink', 'pattern': '.', 'action': ['python', 'src/build/util/lastchange.py', '--git-hash-only', @@ -735,7 +744,7 @@ 'action': ['python', 'src/build/get_syzygy_binaries.py', '--output-dir=src/third_party/syzygy/binaries', - '--revision=8341560b55cebb58351b56bcb809bbbe22ca5398', + '--revision=a8456d9248a126881dcfb8707ca7dcdae56e1ac7', '--overwrite', ], }, @@ -811,3 +820,4 @@ }, ] +