Attachment #446050 for bug #591938

Lines 14-20 Link Here

(-)a/base/message_loop/message_pump_libevent.cc (+4 lines)
14	#include "base/files/file_util.h"	14	#include "base/files/file_util.h"
15	#include "base/logging.h"	15	#include "base/logging.h"
16	#include "base/posix/eintr_wrapper.h"	16	#include "base/posix/eintr_wrapper.h"
		17	#if defined(USE_SYSTEM_LIBEVENT)
		18	#include <event.h>
		19	#else
17	#include "base/third_party/libevent/event.h"	20	#include "base/third_party/libevent/event.h"
		21	#endif
18	#include "base/time/time.h"	22	#include "base/time/time.h"
19	#include "base/trace_event/trace_event.h"	23	#include "base/trace_event/trace_event.h"
20	#include "build/build_config.h"	24	#include "build/build_config.h"

Lines 17-22 it with its own BUILD.gn to the final destination. Link Here

(-)a/tools/gn/bootstrap/bootstrap.py (+7 lines)
17		17
18	import contextlib	18	import contextlib
19	import errno	19	import errno
		20	import filecmp
20	import logging	21	import logging
21	import optparse	22	import optparse
22	import os	23	import os
Lines 594-599 def write_gn_ninja(path, root_gen_dir, options): Link Here
594	'base/third_party/libevent/epoll.c',	595	'base/third_party/libevent/epoll.c',
595	])	596	])
596		597
		598	f1 = os.path.join(SRC_ROOT, 'build/linux/unbundle/libevent.gn')
		599	f2 = os.path.join(SRC_ROOT, 'base/third_party/libevent/BUILD.gn')
		600	if os.path.isfile(f1) and os.path.isfile(f2) and filecmp.cmp(f1, f2):
		601	del static_libraries['libevent']
		602	cflags.extend(['-DUSE_SYSTEM_LIBEVENT'])
		603	libs.extend(['-levent'])
597		604
598	if is_mac:	605	if is_mac:
599	static_libraries['base']['sources'].extend([	606	static_libraries['base']['sources'].extend([

Lines 67-72 def GeneratorMain(argv): Link Here

(-)a/tools/generate_shim_headers/generate_shim_headers.py (+6 lines)
67	if options.generate:	67	if options.generate:
68	header_path = os.path.join(target_directory, header_filename)	68	header_path = os.path.join(target_directory, header_filename)
69	header_dir = os.path.dirname(header_path)	69	header_dir = os.path.dirname(header_path)
		70	source_header = os.path.join(root, header_filename)
		71	if os.path.isfile(source_header):
		72	try:
		73	os.rename(source_header, source_header + '.orig')
		74	except:
		75	pass
70	if not os.path.exists(header_dir):	76	if not os.path.exists(header_dir):
71	os.makedirs(header_dir)	77	os.makedirs(header_dir)
72	with open(header_path, 'w') as f:	78	with open(header_path, 'w') as f:

Return to bug 591938