mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-13 05:40:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make WebRTC use third_party/libevent rather than base/third_party/libevent

Browse source 
Bug: chromium:1335194
Change-Id: I084b391b42e2496163ea625c0bdc9255177e5603
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/266680
Auto-Submit: Daniel.L (Byoungchan) Lee <daniel.l@hpcnt.com>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#37375}
This commit is contained in:
Byoungchan Lee 2022-06-23 22:06:00 +09:00 committed by WebRTC LUCI CQ
parent fa1a81cba8
commit d69a726989
5 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
DEPS
View file

@ -24,8 +24,7 @@ vars = {
} }
deps = { deps = {
# TODO(kjellander): Move this to be Android-only once the libevent dependency # TODO(kjellander): Move this to be Android-only.
# in base/third_party/libevent is solved.
'src/base': 'src/base':
'https://chromium.googlesource.com/chromium/src/base@2f3d3763f35854e8436ad0f4acced5a6762b772a', 'https://chromium.googlesource.com/chromium/src/base@2f3d3763f35854e8436ad0f4acced5a6762b772a',
'src/build': 'src/build':

2
rtc_base/BUILD.gn
View file

@ -649,7 +649,7 @@ if (rtc_enable_libevent) {
"//third_party/abseil-cpp/absl/strings", "//third_party/abseil-cpp/absl/strings",
] ]
if (rtc_build_libevent) { if (rtc_build_libevent) {
deps += [ "//base/third_party/libevent" ] deps += [ "//third_party/libevent" ]
} }
} }
} }

2
rtc_base/DEPS
View file

@ -1,8 +1,8 @@
include_rules = [ include_rules = [
"+base/third_party/libevent",
"+json", "+json",
"+system_wrappers", "+system_wrappers",
"+third_party/jsoncpp", "+third_party/jsoncpp",
"+third_party/libevent",
] ]
specific_include_rules = { specific_include_rules = {

2
rtc_base/task_queue_libevent.cc
View file

@ -27,7 +27,6 @@
#include "absl/strings/string_view.h" #include "absl/strings/string_view.h"
#include "api/task_queue/queued_task.h" #include "api/task_queue/queued_task.h"
#include "api/task_queue/task_queue_base.h" #include "api/task_queue/task_queue_base.h"
#include "base/third_party/libevent/event.h"
#include "rtc_base/checks.h" #include "rtc_base/checks.h"
#include "rtc_base/logging.h" #include "rtc_base/logging.h"
#include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/numerics/safe_conversions.h"
@ -36,6 +35,7 @@
#include "rtc_base/synchronization/mutex.h" #include "rtc_base/synchronization/mutex.h"
#include "rtc_base/thread_annotations.h" #include "rtc_base/thread_annotations.h"
#include "rtc_base/time_utils.h" #include "rtc_base/time_utils.h"
#include "third_party/libevent/event.h"
namespace webrtc { namespace webrtc {
namespace { namespace {

6
tools_webrtc/libs/generate_licenses.py
View file

@ -53,8 +53,7 @@ LIB_TO_LICENSES_DICT = {
'libaom': ['third_party/libaom/source/libaom/LICENSE'], 'libaom': ['third_party/libaom/source/libaom/LICENSE'],
'libc++': ['buildtools/third_party/libc++/trunk/LICENSE.TXT'], 'libc++': ['buildtools/third_party/libc++/trunk/LICENSE.TXT'],
'libc++abi': ['buildtools/third_party/libc++abi/trunk/LICENSE.TXT'], 'libc++abi': ['buildtools/third_party/libc++abi/trunk/LICENSE.TXT'],
'libevent': 'libevent': ['third_party/libevent/LICENSE'],
['base/third_party/libevent/LICENSE', 'third_party/libevent/LICENSE'],
'libjpeg_turbo': ['third_party/libjpeg_turbo/LICENSE.md'], 'libjpeg_turbo': ['third_party/libjpeg_turbo/LICENSE.md'],
'libsrtp': ['third_party/libsrtp/LICENSE'], 'libsrtp': ['third_party/libsrtp/LICENSE'],
'libunwind': ['buildtools/third_party/libunwind/trunk/LICENSE.TXT'], 'libunwind': ['buildtools/third_party/libunwind/trunk/LICENSE.TXT'],
@ -221,9 +220,6 @@ class LicenseBuilder:
output_license_file.write('```\n') output_license_file.write('```\n')
for path in self.common_licenses_dict[license_lib]: for path in self.common_licenses_dict[license_lib]:
license_path = os.path.join(WEBRTC_ROOT, path) license_path = os.path.join(WEBRTC_ROOT, path)
# TODO(crbug.com/1335194) Workaround for unblocking autoroller.
if license_lib == "libevent" and not os.path.exists(license_path):
continue
with open(license_path, 'r') as license_file: with open(license_path, 'r') as license_file:
license_text = escape(license_file.read(), quote=True) license_text = escape(license_file.read(), quote=True)
output_license_file.write(license_text) output_license_file.write(license_text)