description: build using system libevent author: Michael Gilbert https://anonscm.debian.org/cgit/pkg-chromium/pkg-chromium.git/tree/debian/patches/system/event.patch --- a/third_party/webrtc/base/task_queue_libevent.cc +++ b/third_party/webrtc/base/task_queue_libevent.cc @@ -15,7 +15,7 @@ #include #include -#include "base/third_party/libevent/event.h" +#include #include "webrtc/base/checks.h" #include "webrtc/base/logging.h" #include "webrtc/base/task_queue_posix.h" --- a/tools/gn/bootstrap/bootstrap.py +++ b/tools/gn/bootstrap/bootstrap.py @@ -609,26 +609,6 @@ def write_gn_ninja(path, root_gen_dir, o 'base/time/time_now_posix.cc', 'base/trace_event/heap_profiler_allocation_register_posix.cc', ]) - static_libraries['libevent'] = { - 'sources': [ - 'base/third_party/libevent/buffer.c', - 'base/third_party/libevent/evbuffer.c', - 'base/third_party/libevent/evdns.c', - 'base/third_party/libevent/event.c', - 'base/third_party/libevent/event_tagging.c', - 'base/third_party/libevent/evrpc.c', - 'base/third_party/libevent/evutil.c', - 'base/third_party/libevent/http.c', - 'base/third_party/libevent/log.c', - 'base/third_party/libevent/poll.c', - 'base/third_party/libevent/select.c', - 'base/third_party/libevent/signal.c', - 'base/third_party/libevent/strlcpy.c', - ], - 'tool': 'cc', - 'include_dirs': [], - 'cflags': cflags + ['-DHAVE_CONFIG_H'], - } if is_linux or is_aix: ldflags.extend(['-pthread']) @@ -660,13 +640,7 @@ def write_gn_ninja(path, root_gen_dir, o 'base/allocator/allocator_shim.cc', 'base/allocator/allocator_shim_default_dispatch_to_glibc.cc', ]) - libs.extend(['-lrt', '-latomic', '-lnspr4']) - static_libraries['libevent']['include_dirs'].extend([ - os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'linux') - ]) - static_libraries['libevent']['sources'].extend([ - 'base/third_party/libevent/epoll.c', - ]) + libs.extend(['-lrt', '-latomic', '-lnspr4', '-levent']) else: libs.extend(['-lrt']) static_libraries['base']['sources'].extend([ @@ -703,12 +677,6 @@ def write_gn_ninja(path, root_gen_dir, o 'base/time/time_mac.cc', 'base/threading/platform_thread_mac.mm', ]) - static_libraries['libevent']['include_dirs'].extend([ - os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'mac') - ]) - static_libraries['libevent']['sources'].extend([ - 'base/third_party/libevent/kqueue.c', - ]) libs.extend([ '-framework', 'AppKit', --- a/base/message_loop/message_pump_libevent.cc +++ b/base/message_loop/message_pump_libevent.cc @@ -14,7 +14,7 @@ #include "base/files/file_util.h" #include "base/logging.h" #include "base/posix/eintr_wrapper.h" -#include "base/third_party/libevent/event.h" +#include #include "base/time/time.h" #include "base/trace_event/trace_event.h" #include "build/build_config.h"