From 3f75209656c5081158e0b80e9919cb286ac2a872 Mon Sep 17 00:00:00 2001 From: Yves Gerey Date: Wed, 27 Nov 2019 17:10:17 +0000 Subject: [PATCH] Revert "Remove temporary workaround for generate_licenses." This reverts commit eac63e7e026216b8e26ce875cd8a908372277794. Reason for revert: The problem still arises in a flaky fashion. See for instance https://ci.chromium.org/p/webrtc/builders/try/android_arm_rel/15429 Original change's description: > Remove temporary workaround for generate_licenses. > > Bug: webrtc:11105 > Change-Id: I6e9243237b79d2809b8ec95905498c0e7bfb1cb0 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/160403 > Reviewed-by: Mirko Bonadei > Commit-Queue: Yves Gerey > Cr-Commit-Position: refs/heads/master@{#29892} TBR=mbonadei@webrtc.org,yvesg@google.com,yvesg@webrtc.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: webrtc:11105 Change-Id: Ie5ffab243b364544e4b02034cb898ef32d922d5f Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/160980 Reviewed-by: Yves Gerey Commit-Queue: Yves Gerey Cr-Commit-Position: refs/heads/master@{#29940} --- tools_webrtc/libs/generate_licenses.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools_webrtc/libs/generate_licenses.py b/tools_webrtc/libs/generate_licenses.py index 8b3345e860..2202188339 100755 --- a/tools_webrtc/libs/generate_licenses.py +++ b/tools_webrtc/libs/generate_licenses.py @@ -69,6 +69,10 @@ LIB_TO_LICENSES_DICT = { 'fft4g': ['common_audio/third_party/fft4g/LICENSE'], 'spl_sqrt_floor': ['common_audio/third_party/spl_sqrt_floor/LICENSE'], + # TODO(bugs.webrtc.org/1110): Remove this hack. This is not a lib. + # For some reason it is listed as so in _GetThirdPartyLibraries. + 'android_deps': [], + # Compile time dependencies, no license needed: 'yasm': [], 'ow2_asm': [],