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

Update webrtc guava dependency

Browse Source 
This CL renames webrtc guava dependencies from
third_party/guava:guava_android_java  to
//third_party/android_deps:guava_android_java

This is in preparation for deleting third_party/guava:guava_android_java

BUG=chromium:2560401

No-Presubmit: True
Change-Id: If9227f4ac4d24386896c47eeb38142a76a27a4ea
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/195720
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32730}
This commit is contained in:
Peter Kotwicz 2020-11-28 20:35:44 -05:00 committed by Commit Bot
parent 39f09b4c83
commit 625964f6e0
3 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
DEPS
View File

@ -338,17 +338,6 @@ deps = {
'dep_type': 'cipd',
},
'src/third_party/guava': {
'packages': [
{
'package': 'chromium/third_party/guava',
'version': 'y8Zx7cKTiOunLhOrfC4hOt5kDQrLJ_Rq7ISDmXkPdYsC',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
'src/third_party/hamcrest': {
'packages': [
{

2
sdk/android/BUILD.gn
View File

@ -1376,10 +1376,10 @@ if (is_android) {
"//base:base_java_test_support",
"//rtc_base:base_java",
"//third_party/android_deps:com_android_support_support_annotations_java",
"//third_party/android_deps:guava_android_java",
"//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java",
"//third_party/google-truth:google_truth_java",
"//third_party/guava:guava_android_java",
"//third_party/hamcrest:hamcrest_java",
"//third_party/hamcrest:hamcrest_library_java",
"//third_party/junit",

2
tools_webrtc/libs/generate_licenses.py
View File

@ -47,7 +47,7 @@ LIB_TO_LICENSES_DICT = {
'com_google_errorprone_error_prone_core/LICENSE'
],
'fiat': ['third_party/boringssl/src/third_party/fiat/LICENSE'],
'guava': ['third_party/guava/LICENSE'],
'guava': ['third_party/android_deps/libs/com_google_guava_guava/LICENSE'],
'ijar': ['third_party/ijar/LICENSE'],
'jsoncpp': ['third_party/jsoncpp/LICENSE'],
'libaom': ['third_party/libaom/source/libaom/LICENSE'],