admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix chromium roll into WebRTC

Browse Source 
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 <mbonadei@webrtc.org>
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#33406}
This commit is contained in:
Artem Titov 2021-03-09 14:17:31 +01:00 committed by Commit Bot
parent c84a887b8a
commit dc08aea610
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
DEPS
View File

@ -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': [
{