--- tools/gn/bootstrap/bootstrap.py.orig +++ tools/gn/bootstrap/bootstrap.py @@ -184,7 +184,7 @@ {'ENABLE_MUTEX_PRIORITY_INHERITANCE': 'false'}) write_buildflag_header_manually(root_gen_dir, 'base/allocator/buildflags.h', - {'USE_ALLOCATOR_SHIM': 'true' if is_linux else 'false'}) + {'USE_ALLOCATOR_SHIM': 'false' }) write_buildflag_header_manually(root_gen_dir, 'base/debug/debugging_buildflags.h', @@ -438,8 +438,6 @@ 'base/third_party/superfasthash/superfasthash.c', ]) static_libraries['base']['sources'].extend([ - 'base/allocator/allocator_check.cc', - 'base/allocator/allocator_extension.cc', 'base/at_exit.cc', 'base/base_paths.cc', 'base/base_switches.cc', @@ -641,26 +639,6 @@ 'base/time/time_conversion_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: static_libraries['xdg_user_dirs'] = { @@ -767,17 +745,7 @@ '-D_LIBCXXABI_NO_EXCEPTIONS', ] } - static_libraries['base']['sources'].extend([ - 'base/allocator/allocator_shim.cc', - 'base/allocator/allocator_shim_default_dispatch_to_glibc.cc', - ]) - libs.extend(['-lrt', '-latomic']) - 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', '-levent']) else: ldflags.extend(['-pthread']) libs.extend(['-lrt']) --- base/message_loop/message_pump_libevent.cc.orig +++ 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 "event.h" #include "base/time/time.h" #include "base/trace_event/trace_event.h" #include "build/build_config.h"