diff --git a/DEPS b/DEPS index afdc4f0..71b34420 100644 --- a/DEPS +++ b/DEPS
@@ -17,10 +17,11 @@ # # # Create and switch to a new branch # git new-branch depsroll -# # Run roll-dep (provided by depot_tools) giving the dep's path and the -# # desired SVN revision number (e.g., third_party/foo/bar and a revision such -# # number from Subversion) -# roll-dep third_party/foo/bar REVISION_NUMBER +# # Run roll-dep (provided by depot_tools) giving the dep's path and optionally +# # a regex that will match the line in this file that contains the current +# # revision. The script ALWAYS rolls the dependency to the latest revision +# # in origin/master. The path for the dep should start with src/. +# roll-dep src/third_party/foo_package/src foo_package.git # # You should now have a modified DEPS file; commit and upload as normal # git commit -a # git cl upload @@ -30,39 +31,39 @@ # 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': '2ec92a3d6abcc69fc8fb5f89b1b4391b341ecd42', # from svn revision 198437 + 'webkit_revision': '76c717758a3912e62a61db74f45c3432ef1335d2', # from svn revision 201381 'chromium_git': 'https://chromium.googlesource.com', - 'libvpx_revision': 'aa9b5f1d6e226fbeae31b2e8984d6c135c61169f', + 'libvpx_revision': 'a208ecae8e6fff1c0d4286bdc000d7c5efaab411', 'sfntly_revision': '1bdaae8fc788a5ac8936d68bf24f37d977a13dac', - 'skia_revision': '2f19b551ac10b96a1a35a147063cd4300d6fe07a', + 'skia_revision': '4204800cd8f311f11491cf2eb7e32ca681f05489', # 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': 'a90cc61910e5225c56f6304a1de9a03081b2e4b7', + 'v8_revision': 'c45557b83149bd1b95c5b7a19ecb8f567464dfb1', # 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': 'b39a448d8522392389b28f6997126a6ab04bfe87', + 'swarming_revision': '2866a22530cb65feae5d9f64c83636aed5391d06', # 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': 'e62cedd0e9d6575b561622209dd591a28870320c', + 'angle_revision': '254fceac120114abd575da7095e81394eafa008f', # 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': 'ecc8e253abac3b6186a97573871a084f4c0ca3ae', + 'buildtools_revision': '565d04e8741429fb1b4f26d102f2c6c3b849edeb', # 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': 'cc2323f0d0d626edac4a426097eb38b53ba54848', + 'pdfium_revision': 'a2b3ae23556fb2f1adbc008574f33bf365476af9', # 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': '22bb1085a6a0f6f3589a8c3d60ed0a9b82248275', + 'openmax_dl_revision': '2eb98d819bed3082071a09268b886bc4496c6fb5', # 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': 'de24aadc5bc01130b6a9d25582203bb5308fabe1', + 'boringssl_revision': '12fe1b25ead258858309d22ffa9e1f9a316358d7', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling nss # and whatever else without interference from each other. @@ -78,11 +79,16 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling lss # and whatever else without interference from each other. - 'lss_revision': '6f97298fe3794e92c8c896a6bc06e0b36e4c3de3', + 'lss_revision': '4fc942258fe5509549333b9487ec018e3c8c5b10', # 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': '4e75a2959c8c77f68890c29c5082e2a67c99de6f', + 'nacl_revision': '495bd47427a144f90c2340890c265bb39eccca12', + # Three lines of non-changing comments so that + # the commit queue can handle CLs rolling dEQP + # and whatever else without interference from each other. + 'deqp_revision': '194294e69d44eac48bc1fb063bd607189650aa5e', + 'deqp_url': 'https://android.googlesource.com/platform/external/deqp', } # Only these hosts are allowed for dependencies in this DEPS file. @@ -96,19 +102,19 @@ deps = { 'src/breakpad/src': - Var('chromium_git') + '/external/google-breakpad/src.git' + '@' + '0bccfcc38087bf8b71c04befe6cd83c683db980a', # from svn revision 1465 + Var('chromium_git') + '/external/google-breakpad/src.git' + '@' + 'e100989d3776aa1a6bfa9453edca227a679e3a0c', # from svn revision 1495 'src/buildtools': Var('chromium_git') + '/chromium/buildtools.git' + '@' + Var('buildtools_revision'), 'src/sdch/open-vcdiff': - Var('chromium_git') + '/external/open-vcdiff.git' + '@' + '438f2a5be6d809bc21611a94cd37bfc8c28ceb33', # from svn revision 41 + Var('chromium_git') + '/external/github.com/google/open-vcdiff.git' + '@' + '39ff500790fa8038f80bd2fdcd10c35568a12529', 'src/testing/gtest': - Var('chromium_git') + '/external/googletest.git' + '@' + '23574bf2333f834ff665f894c97bef8a5b33a0a9', # from svn revision 711 + Var('chromium_git') + '/external/googletest.git' + '@' + '9855a87157778d39b95eccfb201a9dc90f6d61c6', # from svn revision 746 'src/testing/gmock': - Var('chromium_git') + '/external/googlemock.git' + '@' + '29763965ab52f24565299976b936d1265cb6a271', # from svn revision 501 + Var('chromium_git') + '/external/googlemock.git' + '@' + '0421b6f358139f02e102c9c332ce19a33faf75be', # from svn revision 566 'src/third_party/angle': Var('chromium_git') + '/angle/angle.git' + '@' + Var('angle_revision'), @@ -117,16 +123,13 @@ Var('chromium_git') + '/external/colorama.git' + '@' + '799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8', 'src/third_party/crashpad/crashpad': - Var('chromium_git') + '/crashpad/crashpad.git' + '@' + '797adb320680a4a8ad39428075cca287e04b111f', - - 'src/third_party/trace-viewer': - Var('chromium_git') + '/external/trace-viewer.git' + '@' + '4f30209abd53c699c937519f39ce41888f93507b', + Var('chromium_git') + '/crashpad/crashpad.git' + '@' + '14a22412747a79d9511bdf7505ae8b5f1ba3a2c7', 'src/third_party/WebKit': Var('chromium_git') + '/chromium/blink.git' + '@' + Var('webkit_revision'), 'src/third_party/icu': - Var('chromium_git') + '/chromium/deps/icu.git' + '@' + 'c81a1a3989c3b66fa323e9a6ee7418d7c08297af', + Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '6b3ce817f8e828c3b7a577d2395f0882eb56ef18', 'src/third_party/libexif/sources': Var('chromium_git') + '/chromium/deps/libexif/sources.git' + '@' + 'ed98343daabd7b4497f97fda972e132e6877c48a', @@ -144,10 +147,10 @@ Var('chromium_git') + '/external/snappy.git' + '@' + '762bb32f0c9d2f31ba4958c7c0933d22e80c20bf', 'src/tools/grit': - Var('chromium_git') + '/external/grit-i18n.git' + '@' + '1dac9ae64b0224beb1547810933a6f9998d0d55e', # from svn revision 191 + Var('chromium_git') + '/external/grit-i18n.git' + '@' + '15d48e32cc9f346245c823ce48c54209d02ea983', # from svn revision 196 'src/tools/gyp': - Var('chromium_git') + '/external/gyp.git' + '@' + '5122240c5e5c4d8da12c543d82b03d6089eb77c5', + Var('chromium_git') + '/external/gyp.git' + '@' + '6ee91ad8659871916f9aa840d42e1513befdf638', 'src/tools/swarming_client': Var('chromium_git') + '/external/swarming.client.git' + '@' + Var('swarming_revision'), @@ -177,7 +180,7 @@ Var('chromium_git') + '/external/bidichecker/lib.git' + '@' + '97f2aa645b74c28c57eca56992235c79850fa9e0', 'src/third_party/webgl/src': - Var('chromium_git') + '/external/khronosgroup/webgl.git' + '@' + '8986f8bfa84547b1a30a9256ebdd665024d68d71', + Var('chromium_git') + '/external/khronosgroup/webgl.git' + '@' + 'a62453dbe975574d6b0550d3ef87a7e279ae86a1', 'src/third_party/webdriver/pylib': Var('chromium_git') + '/external/selenium/py.git' + '@' + '5fd78261a75fe08d27ca4835fb6c5ce4b42275bd', @@ -186,25 +189,25 @@ Var('chromium_git') + '/chromium/deps/libvpx.git' + '@' + Var('libvpx_revision'), 'src/third_party/ffmpeg': - Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + '1f2f7df0f4005fb620342d847bbaa1ec54122c68', + Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + '3651d8ef1fe8bf1fab61da6298341470402c991a', 'src/third_party/libjingle/source/talk': - Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + '0b420e23cd618a42ec1ec567a3e8104ea716847e', # commit position 9544 + Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + 'e8b3f11230aab0b2687f73850a9e61b6fd8882ac', # commit position 9787 'src/third_party/usrsctp/usrsctplib': Var('chromium_git') + '/external/usrsctplib.git' + '@' + '36444a999739e9e408f8f587cb4c3ffeef2e50ac', # from svn revision 9215 'src/third_party/libsrtp': - Var('chromium_git') + '/chromium/deps/libsrtp.git' + '@' + '9c53f858cddd4d890e405e91ff3af0b48dfd90e6', # from svn revision 295151 + Var('chromium_git') + '/chromium/deps/libsrtp.git' + '@' + '502e81a238a864cfce774d4de3893810629bf227', # from svn revision 295151 'src/third_party/yasm/source/patched-yasm': Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' + '4671120cd8558ce62ee8672ebf3eb6f5216f909b', 'src/third_party/libjpeg_turbo': - Var('chromium_git') + '/chromium/deps/libjpeg_turbo.git' + '@' + 'f4631b6ee8b1dbb05e51ae335a7886f9ac598ab6', + Var('chromium_git') + '/chromium/deps/libjpeg_turbo.git' + '@' + '631e2dd119d49794e3572b6ca3f16ee39d59f372', 'src/third_party/flac': - Var('chromium_git') + '/chromium/deps/flac.git' + '@' + 'c291ce676d2c855f7b2739f00f5c7f7e813813dc', + Var('chromium_git') + '/chromium/deps/flac.git' + '@' + 'e1b6e7983a8c54954f13f40772a40f490f1eefca', 'src/third_party/pyftpdlib/src': Var('chromium_git') + '/external/pyftpdlib.git' + '@' + '2be6d65e31c7ee6320d059f581f05ae8d89d7e45', @@ -213,7 +216,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' + '@' + 'f052387647c2a0d7083812195b1ffcdf73fe2633', # commit position 9551 + Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + '8cd6e8f2e51b6eee9c1d17ddb00b70c03bae6f4a', # commit position 9787 'src/third_party/openmax_dl': Var('chromium_git') + '/external/webrtc/deps/third_party/openmax.git' + '@' + Var('openmax_dl_revision'), @@ -222,7 +225,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' + '@' + '6dde4f14bd3b3d1777a371feabbe8130bc043dfa', # from svn revision 1437 + Var('chromium_git') + '/libyuv/libyuv.git' + '@' + '3c4f5735ce1080bb52acd034c9318ed53418bb57', # from version 1474 'src/third_party/smhasher/src': Var('chromium_git') + '/external/smhasher.git' + '@' + 'e87738e57558e0ec472b2fc3a643b838e5b6e88f', @@ -242,7 +245,7 @@ Var('chromium_git') + '/chromium/tools/deps2git.git' + '@' + 'f04828eb0b5acd3e7ad983c024870f17f17b06d9', 'src/third_party/webpagereplay': - Var('chromium_git') + '/external/github.com/chromium/web-page-replay.git' + '@' + '5da5975950daa7b30a6938da73fd0b3200901b0c', + Var('chromium_git') + '/external/github.com/chromium/web-page-replay.git' + '@' + '7564939bdf6482d57b9bd5e9c931679f96d8cf75', 'src/third_party/pywebsocket/src': Var('chromium_git') + '/external/pywebsocket/src.git' + '@' + 'cb349e87ddb30ff8d1fa1a89be39cec901f4a29c', @@ -254,10 +257,13 @@ Var('chromium_git') + '/chromium/cdm.git' + '@' + '7377023e384f296cbb27644eb2c485275f1f92e8', # from svn revision 294518 'src/third_party/mesa/src': - Var('chromium_git') + '/chromium/deps/mesa.git' + '@' + '071d25db04c23821a12a8b260ab9d96a097402f0', + Var('chromium_git') + '/chromium/deps/mesa.git' + '@' + '3918dbd3bced7843af396a0ee9f9da081d968806', 'src/third_party/cld_2/src': - Var('chromium_git') + '/external/cld2.git' + '@' + '14d9ef8d4766326f8aa7de54402d1b9c782d4481', # from svn revision 193 + Var('chromium_git') + '/external/github.com/CLD2Owners/cld2.git' + '@' + '84b58a5d7690ebf05a91406f371ce00c3daf31c0', + + 'src/third_party/libwebm/source': + Var('chromium_git') + '/webm/libwebm.git' + '@' + '75a6d2da8b63e0c446ec0ce1ac942c2962d959d7', 'src/third_party/pdfium': 'https://pdfium.googlesource.com/pdfium.git' + '@' + Var('pdfium_revision'), @@ -270,6 +276,10 @@ 'src/third_party/dom_distiller_js/dist': Var('chromium_git') + '/external/github.com/chromium/dom-distiller-dist.git' + '@' + '81e5b59da2a7a0a518b90b5ded58670322c98128', + + 'src/third_party/catapult': + Var('chromium_git') + '/external/github.com/catapult-project/catapult.git' + '@' + + '7567b4beb0c11e9c2993c1f7da9c224b02a630f2', } @@ -321,7 +331,7 @@ # ANGLE uses dEQP for GPU testing 'src/third_party/deqp/src': - 'https://android.googlesource.com/platform/external/deqp@194294e69d44eac48bc1fb063bd607189650aa5e', + Var('deqp_url') + '@' + Var('deqp_revision'), }, 'ios': { 'src/ios/third_party/gcdwebserver/src': @@ -335,7 +345,7 @@ # class-dump utility to generate header files for undocumented SDKs 'src/third_party/class-dump/src': - Var('chromium_git') + '/external/github.com/nygard/class-dump.git' + '@' + '93e7c6a5419380d89656dcc511dc60d475199b67', + Var('chromium_git') + '/external/github.com/nygard/class-dump.git' + '@' + '978d177ca6f0d2e5e34acf3e8dadc63e3140ebbc', # Code that's not needed due to not building everything 'src/chrome/test/data/perf/canvas_bench': None, @@ -379,7 +389,7 @@ # For Linux and Chromium OS. 'src/third_party/cros_system_api': - Var('chromium_git') + '/chromiumos/platform/system_api.git' + '@' + '513f58ccbcecfd4a3d21545f67136090838eaf52', + Var('chromium_git') + '/chromiumos/platform/system_api.git' + '@' + 'c3d89bb4a8d9c8622bbdbd846085c3c96643b253', # Note that this is different from Android's freetype repo. 'src/third_party/freetype2/src': @@ -387,7 +397,7 @@ # Build tools for Chrome OS. 'src/third_party/chromite': - Var('chromium_git') + '/chromiumos/chromite.git' + '@' + '8a83c625c57a1ad990ba8f5f95890b57d204501f', + Var('chromium_git') + '/chromiumos/chromite.git' + '@' + 'e19f83ba227bf1ec0077f5d3a816a415f1dd88d0', # Dependency of chromite.git. 'src/third_party/pyelftools': @@ -402,13 +412,17 @@ 'src/third_party/stp/src': Var('chromium_git') + '/external/github.com/stp/stp.git' + '@' + 'fc94a599207752ab4d64048204f0c88494811b62', + + # ANGLE uses dEQP for GPU testing + 'src/third_party/deqp/src': + Var('deqp_url') + '@' + Var('deqp_revision'), }, 'android': { 'src/third_party/android_protobuf/src': Var('chromium_git') + '/external/android_protobuf.git' + '@' + '999188d0dc72e97f7fe08bb756958a2cf090f4e7', 'src/third_party/android_tools': - Var('chromium_git') + '/android_tools.git' + '@' + '21f4bcbd6cd927e4b4227cfde7d5f13486be1236', + Var('chromium_git') + '/android_tools.git' + '@' + '4238a28593b7e6178c95431f91ca8c24e45fa7eb', 'src/third_party/apache-mime4j': Var('chromium_git') + '/chromium/deps/apache-mime4j.git' + '@' + '28cb1108bff4b6cf0a2e86ff58b3d025934ebe3a', @@ -417,13 +431,13 @@ Var('chromium_git') + '/external/github.com/appurify/appurify-python.git' + '@' + 'ee7abd5c5ae3106f72b2a0b9d2cb55094688e867', 'src/third_party/cardboard-java/src': - Var('chromium_git') + '/external/github.com/googlesamples/cardboard-java.git' + '@' + '08ad25a04f2801bd822c3f2cd28301b68d74aef6', + Var('chromium_git') + '/external/github.com/googlesamples/cardboard-java.git' + '@' + 'e36ee57e72bbd057ddb53b127954177b50e18df7', 'src/third_party/errorprone/lib': - Var('chromium_git') + '/chromium/third_party/errorprone.git' + '@' + '6c66e56c0f9d750aef83190466df834f9d6af8ab', + Var('chromium_git') + '/chromium/third_party/errorprone.git' + '@' + '95f929ff6f9213bc7d078c200db3f3dc864f425f', 'src/third_party/findbugs': - Var('chromium_git') + '/chromium/deps/findbugs.git' + '@' + '7f69fa78a6db6dc31866d09572a0e356e921bf12', + Var('chromium_git') + '/chromium/deps/findbugs.git' + '@' + '57f05238d3ac77ea0a194813d3065dd780c6e566', 'src/third_party/freetype-android/src': Var('chromium_git') + '/chromium/src/third_party/freetype2.git' + '@' + 'e186230678ee8e4ea4ac4797ece8125761e3225a', @@ -453,7 +467,7 @@ Var('chromium_git') + '/chromium/third_party/robolectric.git' + '@' + '6b63c99a8b6967acdb42cbed0adb067c80efc810', 'src/third_party/ub-uiautomator/lib': - Var('chromium_git') + '/chromium/third_party/ub-uiautomator.git' + '@' + 'e6f02481bada8bdbdfdd7987dd6e648c44a3adcb', + Var('chromium_git') + '/chromium/third_party/ub-uiautomator.git' + '@' + '00270549ce3161ae72ceb24712618ea28b4f9434', 'src/third_party/lss': Var('chromium_git') + '/external/linux-syscall-support/lss.git' + '@' + Var('lss_revision'), @@ -462,7 +476,7 @@ Var('chromium_git') + '/external/github.com/kennethreitz/requests.git' + '@' + 'f172b30356d821d180fa4ecfa3e71c7274a32de4', 'src/third_party/custom_tabs_client/src': - Var('chromium_git') + '/external/github.com/GoogleChrome/custom-tabs-client.git' + '@' + '47a8e598e6116a211c320d285d887e9fb9376524', + Var('chromium_git') + '/external/github.com/GoogleChrome/custom-tabs-client.git' + '@' + 'bbbf71f41e79b0cfe21199220f495cbd0a3a4ffb', }, } @@ -581,6 +595,13 @@ '-s', 'src/third_party/WebKit', '-o', 'src/build/util/LASTCHANGE.blink'], }, + { + # Update CANARY_VERSION. + 'name': 'ios_canary_version', + 'pattern': '.', + 'action': ['python', 'src/ios/build/util/canary_version.py', + '-o', 'src/ios/build/util/CANARY_VERSION'], + }, # Pull GN binaries. This needs to be before running GYP below. { 'name': 'gn_win', @@ -713,7 +734,7 @@ 'action': ['python', 'src/build/get_syzygy_binaries.py', '--output-dir=src/third_party/syzygy/binaries', - '--revision=e50a9822fc8aeb5e7902da5e2940ea135d732e57', + '--revision=8341560b55cebb58351b56bcb809bbbe22ca5398', '--overwrite', ], }, @@ -723,7 +744,7 @@ 'action': ['python', 'src/build/get_syzygy_binaries.py', '--output-dir=src/third_party/kasko', - '--revision=283aeaceeb22e2ba40a1753e3cb32454b59cc017', + '--revision=56f13b37f044639b4c28cb75f327ca5e3db8758e', '--resource=kasko.zip', '--resource=kasko_symbols.zip', '--overwrite', @@ -743,15 +764,6 @@ 'src/third_party/apache-win32', ], }, - # Pull the mojo_shell binary, used for mojo development - { - 'name': 'download_mojo_shell', - 'pattern': '', - 'action': [ 'python', - 'src/third_party/mojo/src/mojo/public/tools/download_shell_binary.py', - '--tools-directory=../../../../../../tools', - ], - }, { # Pull sanitizer-instrumented third-party libraries if requested via # GYP_DEFINES. @@ -771,6 +783,7 @@ 'src/tools/remove_stale_pyc_files.py', 'src/android_webview/tools', 'src/gpu/gles2_conform_support', + 'src/infra', 'src/ppapi', 'src/printing', 'src/third_party/closure_compiler/build', @@ -796,3 +809,5 @@ ], }, ] + +