From 625964f6e00db3a6f75346d508fae32855bcc762 Mon Sep 17 00:00:00 2001 From: Peter Kotwicz Date: Sat, 28 Nov 2020 20:35:44 -0500 Subject: [PATCH] Update webrtc guava dependency 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 Reviewed-by: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#32730} --- DEPS | 11 ----------- sdk/android/BUILD.gn | 2 +- tools_webrtc/libs/generate_licenses.py | 2 +- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/DEPS b/DEPS index 47ffe1a5e0..002bb0ee31 100644 --- a/DEPS +++ b/DEPS @@ -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': [ { diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn index cf53e7aa74..b3532ffbce 100644 --- a/sdk/android/BUILD.gn +++ b/sdk/android/BUILD.gn @@ -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", diff --git a/tools_webrtc/libs/generate_licenses.py b/tools_webrtc/libs/generate_licenses.py index b1587af5ae..f33c050291 100755 --- a/tools_webrtc/libs/generate_licenses.py +++ b/tools_webrtc/libs/generate_licenses.py @@ -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'],