From a67c93eeb83f788842444ec13196c43a8b5378e6 Mon Sep 17 00:00:00 2001 From: Henrik Kjellander Date: Thu, 7 Sep 2017 11:06:02 +0200 Subject: [PATCH] Roll chromium_revision da6245e7c4..21e78fbe27 (488751:500243) + fix DEPS Manually change DEPS URL for src/tools/swarming_client to match Chromium Similar to https://chromium.googlesource.com/external/webrtc/+/4ccd9c1493979bb1b4721ffdfdc59568ce5a40db%5E%21/#F0 Also add downloading of third_party/bazel/desugar since it's not required by the build toolchain on Android. Change log: https://chromium.googlesource.com/chromium/src/+log/da6245e7c4..21e78fbe27 Full diff: https://chromium.googlesource.com/chromium/src/+/da6245e7c4..21e78fbe27 Changed dependencies: * src/base: https://chromium.googlesource.com/chromium/src/base/+log/8c06e7a9f6..bdaf4d9893 * src/build: https://chromium.googlesource.com/chromium/src/build/+log/5a3f439e92..92ccaf1432 * src/buildtools: https://chromium.googlesource.com/chromium/buildtools.git/+log/5ad14542a6..cbc33b9c0a * src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/e5a58b0b43..436ef979f7 * src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/ebf1c4622e..dcfc1809e9 * src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/d58cf433a5..36421e57a8 * src/third_party/android_tools: https://chromium.googlesource.com/android_tools.git/+log/e9d4018e14..aadb2fed04 * src/third_party/catapult: https://chromium.googlesource.com/external/github.com/catapult-project/catapult.git/+log/9629af7533..c9667ecd29 * src/third_party/googletest/src: https://chromium.googlesource.com/external/github.com/google/googletest.git/+log/42bc671f47..7f8fefabed * src/third_party/icu: https://chromium.googlesource.com/chromium/deps/icu.git/+log/1fec0c83e9..08cb956852 * src/third_party/robolectric/robolectric: https://chromium.googlesource.com/external/robolectric.git/+log/2a0b6ba221..b02c65cc6d * src/third_party/yasm/source/patched-yasm: https://chromium.googlesource.com/chromium/deps/yasm/patched-yasm.git/+log/7da28c6c7c..b98114e18d * src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/f79809d034..5d14bcccf1 * src/tools/swarming_client: https://chromium.googlesource.com/infra/luci/client-py.git/+log/a56c2b39ca..72b6a2dc60 DEPS diff: https://chromium.googlesource.com/chromium/src/+/da6245e7c4..21e78fbe27/DEPS Clang version changed 308728:310694 Details: https://chromium.googlesource.com/chromium/src/+/da6245e7c4..21e78fbe27/tools/clang/scripts/update.py TBR=fbarchard@google.com BUG=None NOTRY=True Change-Id: Ic0fdefb7def1407e69e74d2c87e4316c323b383b Reviewed-on: https://chromium-review.googlesource.com/654639 Commit-Queue: Henrik Kjellander Reviewed-by: Henrik Kjellander --- DEPS | 42 ++++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/DEPS b/DEPS index d55a30da1..5ef2f518f 100644 --- a/DEPS +++ b/DEPS @@ -1,7 +1,7 @@ vars = { 'chromium_git': 'https://chromium.googlesource.com', - 'chromium_revision': 'da6245e7c4b489a4dc73be76fcb54483add1eb2b', - 'swarming_revision': 'a56c2b39ca23bdf41458421a7f825ddbf3f43f28', + 'chromium_revision': '21e78fbe27c34227e4c4fb7c627907506639b6f5', + 'swarming_revision': '72b6a2dc604673b84794937cb3da3fd755ccc4cd', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling lss # and whatever else without interference from each other. @@ -9,34 +9,34 @@ vars = { # Three lines of non-changing comments so that # the commit queue can handle CLs rolling catapult # and whatever else without interference from each other. - 'catapult_revision': '9629af7533357c245a90fb7130fbfba53a162284', + 'catapult_revision': 'c9667ecd29cbb003b7fbdcd6f2da0f02bf0e7257', } deps = { 'src/build': - Var('chromium_git') + '/chromium/src/build' + '@' + '5a3f439e92d3a55858c4eeda57917664657f45fb', + Var('chromium_git') + '/chromium/src/build' + '@' + '92ccaf1432c198e262a7f5d6b801b77879a4a46c', 'src/buildtools': - Var('chromium_git') + '/chromium/buildtools.git' + '@' + '5ad14542a6a74dd914f067b948c5d3e8d170396b', + Var('chromium_git') + '/chromium/buildtools.git' + '@' + 'cbc33b9c0a9d1bb913895a4319a742c504a2d541', 'src/testing': - Var('chromium_git') + '/chromium/src/testing' + '@' + 'ebf1c4622eba176624b5084a727b8fe308d2896b', + Var('chromium_git') + '/chromium/src/testing' + '@' + 'dcfc1809e921b1d687e5bf4efe5b9f586b32728f', 'src/third_party': - Var('chromium_git') + '/chromium/src/third_party' + '@' + 'd58cf433a5327d71ff38bfeab37bd42932f9740b', + Var('chromium_git') + '/chromium/src/third_party' + '@' + '36421e57a859c83a403e7d5b5d4c0d33b033ea39', 'src/third_party/catapult': Var('chromium_git') + '/external/github.com/catapult-project/catapult.git' + '@' + Var('catapult_revision'), 'src/third_party/colorama/src': Var('chromium_git') + '/external/colorama.git' + '@' + '799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8', 'src/third_party/googletest/src': - Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + '42bc671f47b122fad36db5eccbc06868afdf7862', + Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + '7f8fefabedf2965980585be8c2bff97458f28e0b', 'src/third_party/libjpeg_turbo': Var('chromium_git') + '/chromium/deps/libjpeg_turbo.git' + '@' + 'a1750dbc79a8792dde3d3f7d7d8ac28ba01ac9dd', 'src/third_party/yasm/source/patched-yasm': - Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' + '7da28c6c7c6a1387217352ce02b31754deb54d2a', + Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' + 'b98114e18d8b9b84586b10d24353ab8616d4c5fc', 'src/tools': - Var('chromium_git') + '/chromium/src/tools' + '@' + 'f79809d0346e8191983826dee15df3f2c71b1343', + Var('chromium_git') + '/chromium/src/tools' + '@' + '5d14bcccf197878a8995e1966cadd3d1d33c6eb3', 'src/tools/gyp': Var('chromium_git') + '/external/gyp.git' + '@' + 'd61a9397e668fa9843c4aa7da9e79460fe590bfb', 'src/tools/swarming_client': - Var('chromium_git') + '/external/swarming.client.git' + '@' + Var('swarming_revision'), + Var('chromium_git') + '/infra/luci/client-py.git' + '@' + Var('swarming_revision'), # libyuv-only dependencies (not present in Chromium). 'src/third_party/gflags': @@ -50,13 +50,13 @@ deps = { deps_os = { 'android': { 'src/base': - Var('chromium_git') + '/chromium/src/base' + '@' + '8c06e7a9f6d085c70d25f29a1261c4b01bba7470', + Var('chromium_git') + '/chromium/src/base' + '@' + 'bdaf4d98935e2d0b4934fd3708157a552c9de672', 'src/third_party/android_tools': - Var('chromium_git') + '/android_tools.git' + '@' + 'e9d4018e149d50172ed462a7c21137aa915940ec', + Var('chromium_git') + '/android_tools.git' + '@' + 'aadb2fed04af8606545b0afe4e3060bc1a15fad7', 'src/third_party/ced/src': Var('chromium_git') + '/external/github.com/google/compact_enc_det.git' + '@' + '910cca22d881b02cbc8950fa02ccbcdcfb782456', 'src/third_party/icu': - Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '1fec0c83e9ad7f5a075ae0b50af9a3889f54be0e', + Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '08cb956852a5ccdba7f9c941728bb833529ba3c6', 'src/third_party/jsr-305/src': Var('chromium_git') + '/external/jsr-305.git' + '@' + '642c508235471f7220af6d5df2d3210e3bfc0919', 'src/third_party/junit/src': @@ -68,13 +68,13 @@ deps_os = { 'src/third_party/requests/src': Var('chromium_git') + '/external/github.com/kennethreitz/requests.git' + '@' + 'f172b30356d821d180fa4ecfa3e71c7274a32de4', 'src/third_party/robolectric/robolectric': - Var('chromium_git') + '/external/robolectric.git' + '@' + '2a0b6ba221c14f3371813a676ce06143353e448d', + Var('chromium_git') + '/external/robolectric.git' + '@' + 'b02c65cc6d7465f58f0de48a39914aa905692afa', 'src/third_party/ub-uiautomator/lib': Var('chromium_git') + '/chromium/third_party/ub-uiautomator.git' + '@' + '00270549ce3161ae72ceb24712618ea28b4f9434', }, 'ios': { 'src/ios': - Var('chromium_git') + '/chromium/src/ios' + '@' + 'e5a58b0b437af90c301a3bbbd25f8c620546168b', + Var('chromium_git') + '/chromium/src/ios' + '@' + '436ef979f71a3603ca1c647fecc39e8d09438f9e', }, 'unix': { 'src/third_party/lss': @@ -231,6 +231,16 @@ hooks = [ '-l', 'third_party/ow2_asm' ], }, + { + 'name': 'desugar', + 'pattern': '.', + 'action': ['python', + 'src/build/android/update_deps/update_third_party_deps.py', + 'download', + '-b', 'chromium-android-tools/bazel/desugar', + '-l', 'third_party/bazel/desugar' + ], + }, { 'name': 'icu4j', 'pattern': '.',