From dc08aea6100eb462d0a569cc3deaed7173272d65 Mon Sep 17 00:00:00 2001 From: Artem Titov Date: Tue, 9 Mar 2021 14:17:31 +0100 Subject: [PATCH] Fix chromium roll into WebRTC Add missing org_robolectric_shadows_multidex dependency as it is done in chromium DEPS file. Tried on: https://webrtc-review.googlesource.com/c/src/+/211004 Bug: chromium:1184780 Change-Id: Ib8f9e794b36c8da008672d989271f368df9203df Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/211040 Reviewed-by: Mirko Bonadei Commit-Queue: Artem Titov Cr-Commit-Position: refs/heads/master@{#33406} --- DEPS | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/DEPS b/DEPS index 27e5672304..89d42d68eb 100644 --- a/DEPS +++ b/DEPS @@ -499,6 +499,20 @@ deps = { 'dep_type': 'cipd', }, + # TODO(crbug.com/1184780) Move this back to ANDROID_DEPS Generated Code + # section once org_robolectric_shadows_multidex is updated to a new version + # that does not need jetify. + 'src/third_party/android_deps/libs/org_robolectric_shadows_multidex': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_shadows_multidex', + 'version': 'version:4.3.1-cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + # Everything coming after this is automatically updated by the auto-roller. # === ANDROID_DEPS Generated Code Start === # Generated by //third_party/android_deps/fetch_all.py @@ -2273,17 +2287,6 @@ deps = { 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/org_robolectric_shadows_multidex': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_robolectric_shadows_multidex', - 'version': 'version:4.3.1-cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - 'src/third_party/android_deps/libs/org_robolectric_shadows_playservices': { 'packages': [ {