diff --git a/DEPS b/DEPS index 6c7e44c1..3a2221a9 100644 --- a/DEPS +++ b/DEPS
@@ -31,31 +31,30 @@ # Use this googlecode_url variable only if there is an internal mirror for it. # If you do not know, use the full path while defining your new deps entry. 'googlecode_url': 'http://%s.googlecode.com/svn', - 'webkit_revision': '28b2318940b78745432fd5b80d77bae303c1a5f3', # from svn revision 202337 'chromium_git': 'https://chromium.googlesource.com', - 'libvpx_revision': 'ac1772e3db5c885b554f6a72ca9dbac4245cb0e2', + 'libvpx_revision': '70db2235b7e389f4d1b178320ebce76280c127af', 'sfntly_revision': '1bdaae8fc788a5ac8936d68bf24f37d977a13dac', - 'skia_revision': '013e9e3bb0495ab0b5aff011429a6ac983464d34', + 'skia_revision': 'c9e190ddac3d193e89e580ea3819a55c28f15e61', # 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': 'ea85d95ab0909fec823f0701c745d813108192ff', + 'v8_revision': '40d687146a2c35b1328f21ea5f3b95b2be4dda52', # 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. - 'swarming_revision': '77f720b047fe45f42223e1117b18a8a0a2e38052', + 'swarming_revision': '6e5d2b21f0ac98396cd736097a985346feed1328', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling ANGLE # and whatever else without interference from each other. - 'angle_revision': '98c56da49e3c3adf5f3f508ede538736ff705b19', + 'angle_revision': '69cce580d31bff286d9b44349919e9a1f7386ea0', # 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': 'f7310ee61725e68b1c8921e381830362cf4f0999', + 'buildtools_revision': '8d89c1b15f80323b54b3305b2be7b26686fd5611', # 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': '615d7aba0f7d53a78eb05fbd4ae0e1a7e1d3b103', + 'pdfium_revision': '6c5afa68ed4e21f9d0bfd1ecc01e824d946c5485', # 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. @@ -63,7 +62,7 @@ # 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': '1d128f369c797b8bae996d5e973fc0b8a099a1b8', + 'boringssl_revision': '4c60d356a926b68ac20e8090755799e1525874f0', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling nss # and whatever else without interference from each other. @@ -83,7 +82,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling NaCl # and whatever else without interference from each other. - 'nacl_revision': '2bc21a8056f49f45d183d58481277d889097ad06', + 'nacl_revision': '719fce7fa0c1f11cf05d5c20cdfa6648e8a35611', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling dEQP # and whatever else without interference from each other. @@ -102,13 +101,13 @@ deps = { 'src/breakpad/src': - Var('chromium_git') + '/breakpad/breakpad/src.git' + '@' + '027db3c04fbea96f3efa8e1f722ffff11b19a085', + Var('chromium_git') + '/breakpad/breakpad/src.git' + '@' + 'b0383cd494e736720d237d61af2912bb60960cd8', 'src/buildtools': Var('chromium_git') + '/chromium/buildtools.git' + '@' + Var('buildtools_revision'), 'src/sdch/open-vcdiff': - Var('chromium_git') + '/external/github.com/google/open-vcdiff.git' + '@' + '39ff500790fa8038f80bd2fdcd10c35568a12529', + Var('chromium_git') + '/external/github.com/google/open-vcdiff.git' + '@' + '21d7d0b9c3d0c3ccbdb221c85ae889373f0a2a58', 'src/testing/gtest': Var('chromium_git') + '/external/googletest.git' + '@' + '9855a87157778d39b95eccfb201a9dc90f6d61c6', # from svn revision 746 @@ -125,11 +124,8 @@ 'src/third_party/crashpad/crashpad': Var('chromium_git') + '/crashpad/crashpad.git' + '@' + '595803e1be18aa789ba561aa06db73cfc3c2e7a2', - 'src/third_party/WebKit': - Var('chromium_git') + '/chromium/blink.git' + '@' + Var('webkit_revision'), - 'src/third_party/icu': - Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '6b3ce817f8e828c3b7a577d2395f0882eb56ef18', + Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '423fc7e1107fb08ccf007c4aeb76dcab8b2747c1', 'src/third_party/libexif/sources': Var('chromium_git') + '/chromium/deps/libexif/sources.git' + '@' + 'ed98343daabd7b4497f97fda972e132e6877c48a', @@ -150,7 +146,7 @@ Var('chromium_git') + '/external/grit-i18n.git' + '@' + '15d48e32cc9f346245c823ce48c54209d02ea983', # from svn revision 196 'src/tools/gyp': - Var('chromium_git') + '/external/gyp.git' + '@' + '5d01a8cda53bfa23f1dcbe0c31c33aa30f50cf4c', + Var('chromium_git') + '/external/gyp.git' + '@' + '01528c7244837168a1c80f06ff60fa5a9793c824', 'src/tools/swarming_client': Var('chromium_git') + '/external/swarming.client.git' + '@' + Var('swarming_revision'), @@ -180,7 +176,7 @@ Var('chromium_git') + '/external/bidichecker/lib.git' + '@' + '97f2aa645b74c28c57eca56992235c79850fa9e0', 'src/third_party/webgl/src': - Var('chromium_git') + '/external/khronosgroup/webgl.git' + '@' + 'a62453dbe975574d6b0550d3ef87a7e279ae86a1', + Var('chromium_git') + '/external/khronosgroup/webgl.git' + '@' + '397fdf9245912ce37a01611b7a0ad02cd80de89f', 'src/third_party/webdriver/pylib': Var('chromium_git') + '/external/selenium/py.git' + '@' + '5fd78261a75fe08d27ca4835fb6c5ce4b42275bd', @@ -188,11 +184,14 @@ 'src/third_party/libvpx': Var('chromium_git') + '/chromium/deps/libvpx.git' + '@' + Var('libvpx_revision'), + 'src/third_party/libvpx_new/source/libvpx': + Var('chromium_git') + '/webm/libvpx.git' + '@' + '90a109f0eef8bfaaa4869cf7b2873dac5076b582', + 'src/third_party/ffmpeg': - Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + '2d9eb2814143a958f9781b32a112f814a596e70e', + Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + 'dad5c1808dd2fafaa5ae43b8f7b1a2fe98bd06dd', 'src/third_party/libjingle/source/talk': - Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + '90294bd3b9efff9738119befe3294fbf049b65c3', # commit position 9934 + Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + 'e1e22ac3d7bd583fd61781800409122a245a2aee', # commit position 10081 'src/third_party/usrsctp/usrsctplib': Var('chromium_git') + '/external/usrsctplib.git' + '@' + '36444a999739e9e408f8f587cb4c3ffeef2e50ac', # from svn revision 9215 @@ -204,7 +203,7 @@ Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' + '4671120cd8558ce62ee8672ebf3eb6f5216f909b', 'src/third_party/libjpeg_turbo': - Var('chromium_git') + '/chromium/deps/libjpeg_turbo.git' + '@' + '631e2dd119d49794e3572b6ca3f16ee39d59f372', + Var('chromium_git') + '/chromium/deps/libjpeg_turbo.git' + '@' + 'e4e75037f29745f1546b6ebf5cf532e841c04c2c', 'src/third_party/flac': Var('chromium_git') + '/chromium/deps/flac.git' + '@' + '2c4b86af352b23498315c016dc207e3fb2733fc0', @@ -216,7 +215,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' + '@' + '3e255235dad7c9f591ee82dedffb7f7c9b636338', # commit position 9933 + Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + 'a6ae030b86e4ab27227ac43ed7d7d976214ffeed', # commit position 10081 'src/third_party/openmax_dl': Var('chromium_git') + '/external/webrtc/deps/third_party/openmax.git' + '@' + Var('openmax_dl_revision'), @@ -225,7 +224,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' + '@' + 'fcacbfb27f4cdc71a4b8f636a16235f6b9af465c', # from version 1483 + Var('chromium_git') + '/libyuv/libyuv.git' + '@' + '62c49dc811f078e78ed76bfd7c6358c8b7513a14', # from version 1487 'src/third_party/smhasher/src': Var('chromium_git') + '/external/smhasher.git' + '@' + 'e87738e57558e0ec472b2fc3a643b838e5b6e88f', @@ -275,11 +274,11 @@ Var('chromium_git') + '/external/py_trace_event.git' + '@' + 'dd463ea9e2c430de2b9e53dea57a77b4c3ac9b30', 'src/third_party/dom_distiller_js/dist': - Var('chromium_git') + '/external/github.com/chromium/dom-distiller-dist.git' + '@' + '81e5b59da2a7a0a518b90b5ded58670322c98128', + Var('chromium_git') + '/external/github.com/chromium/dom-distiller-dist.git' + '@' + '445b024cb55f367636e6da4a61796a2afecd6d3f', 'src/third_party/catapult': Var('chromium_git') + '/external/github.com/catapult-project/catapult.git' + '@' + - '7bdbcba774b0b906b413be4c2f083958ffefa481', + '17c9875ee1fe7e078c28450160e7fc08b26fe024', } @@ -393,7 +392,7 @@ # Note that this is different from Android's freetype repo. 'src/third_party/freetype2/src': - Var('chromium_git') + '/chromium/src/third_party/freetype2.git' + '@' + '1dd5f5f4a909866f15c92a45c9702bce290a0151', + Var('chromium_git') + '/chromium/src/third_party/freetype2.git' + '@' + 'fc1532a7c4c592f24a4c1a0261d2845524ca5cff', # Build tools for Chrome OS. 'src/third_party/chromite': @@ -435,7 +434,7 @@ Var('chromium_git') + '/external/github.com/googlesamples/cardboard-java.git' + '@' + 'e36ee57e72bbd057ddb53b127954177b50e18df7', 'src/third_party/errorprone/lib': - Var('chromium_git') + '/chromium/third_party/errorprone.git' + '@' + '95f929ff6f9213bc7d078c200db3f3dc864f425f', + Var('chromium_git') + '/chromium/third_party/errorprone.git' + '@' + '0eea83b66343133b9c76b7d3288c30321818ebcf', 'src/third_party/findbugs': Var('chromium_git') + '/chromium/deps/findbugs.git' + '@' + '57f05238d3ac77ea0a194813d3065dd780c6e566', @@ -593,6 +592,7 @@ 'name': 'lastchange', 'pattern': '.', 'action': ['python', 'src/build/util/lastchange.py', + '--git-hash-only', '-s', 'src/third_party/WebKit', '-o', 'src/build/util/LASTCHANGE.blink'], }, @@ -810,3 +810,4 @@ ], }, ] +