From 41f00de26bb17a3b582122cffaeb49227ea3a791 Mon Sep 17 00:00:00 2001 From: Artem Titov Date: Thu, 1 Nov 2018 16:35:16 +0100 Subject: [PATCH] Fix chromium roll MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit BUG=NONE Change-Id: I7df047ee33700c2ad868a0f36b6e97f08e55a62e Reviewed-on: https://webrtc-review.googlesource.com/c/109010 Reviewed-by: Patrik Höglund Reviewed-by: Patrik Höglund Commit-Queue: Artem Titov Cr-Commit-Position: refs/heads/master@{#25480} --- DEPS | 4 ++-- tools_webrtc/autoroller/roll_deps.py | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/DEPS b/DEPS index 6de561bcb3..4518a87d63 100644 --- a/DEPS +++ b/DEPS @@ -73,8 +73,8 @@ deps = { 'src/third_party/android_build_tools/aapt2': { 'packages': [ { - 'package': 'chromium/third_party/android_tools_aapt2', - 'version': 'version:3.2.0-alpha18-4804415-cr0', + 'package': 'chromium/third_party/android_build_tools/aapt2', + 'version': 'version:3.3.0-beta01-5013011-cr0', }, ], 'condition': 'checkout_android', diff --git a/tools_webrtc/autoroller/roll_deps.py b/tools_webrtc/autoroller/roll_deps.py index 8fd9e74b1b..d3a8bdbca8 100755 --- a/tools_webrtc/autoroller/roll_deps.py +++ b/tools_webrtc/autoroller/roll_deps.py @@ -258,8 +258,9 @@ def BuildDepsentryDict(deps_dict): def _FindChangedCipdPackages(path, old_pkgs, new_pkgs): - assert ({p['package'] for p in old_pkgs} == - {p['package'] for p in new_pkgs}) + pkgs_equal = ({p['package'] for p in old_pkgs} == + {p['package'] for p in new_pkgs}) + assert pkgs_equal, 'Old: %s\n New: %s' % (old_pkgs, new_pkgs) for old_pkg in old_pkgs: for new_pkg in new_pkgs: old_version = old_pkg['version']