summaryrefslogtreecommitdiffstats
path: root/ipc/chromium
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2020-01-23 13:08:02 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-01-23 13:08:02 +0100
commit90c5288fef22004d6e4d441b3ae10b9cd1836103 (patch)
tree14d4a0e5588e0a04ec4cca52805599ed4abb27fe /ipc/chromium
parent3624078103303adf0b934734d95a1ed9eb7bfefd (diff)
downloadUXP-90c5288fef22004d6e4d441b3ae10b9cd1836103.tar
UXP-90c5288fef22004d6e4d441b3ae10b9cd1836103.tar.gz
UXP-90c5288fef22004d6e4d441b3ae10b9cd1836103.tar.lz
UXP-90c5288fef22004d6e4d441b3ae10b9cd1836103.tar.xz
UXP-90c5288fef22004d6e4d441b3ae10b9cd1836103.zip
Issue #1342 - Remove support for system libevent
Diffstat (limited to 'ipc/chromium')
-rw-r--r--ipc/chromium/moz.build6
-rw-r--r--ipc/chromium/src/third_party/libeventcommon.mozbuild2
-rw-r--r--ipc/chromium/src/third_party/moz.build3
3 files changed, 4 insertions, 7 deletions
diff --git a/ipc/chromium/moz.build b/ipc/chromium/moz.build
index dc5b4dca4..b386134f9 100644
--- a/ipc/chromium/moz.build
+++ b/ipc/chromium/moz.build
@@ -58,7 +58,7 @@ if os_win:
'src/chrome/common/process_watcher_win.cc',
'src/chrome/common/transport_dib_win.cc',
]
-elif not CONFIG['MOZ_SYSTEM_LIBEVENT']:
+else:
DIRS += ['src/third_party']
if os_posix:
@@ -143,9 +143,9 @@ if os_solaris:
'src/base/atomicops_internals_x86_gcc.cc',
'src/base/process_util_linux.cc',
'src/base/time_posix.cc',
-]
+ ]
-elif not CONFIG['MOZ_SYSTEM_LIBEVENT']:
+else:
LOCAL_INCLUDES += ['src/third_party/libevent/linux']
ost = CONFIG['OS_TEST']
diff --git a/ipc/chromium/src/third_party/libeventcommon.mozbuild b/ipc/chromium/src/third_party/libeventcommon.mozbuild
index 2b45ecb19..33482c661 100644
--- a/ipc/chromium/src/third_party/libeventcommon.mozbuild
+++ b/ipc/chromium/src/third_party/libeventcommon.mozbuild
@@ -32,7 +32,7 @@ else:
else:
libevent_include_suffix = 'linux'
-if os_posix and not CONFIG['MOZ_SYSTEM_LIBEVENT']:
+if os_posix:
DEFINES['HAVE_CONFIG_H'] = True
LOCAL_INCLUDES += sorted([
'libevent',
diff --git a/ipc/chromium/src/third_party/moz.build b/ipc/chromium/src/third_party/moz.build
index 2b99e53b3..20a5043fb 100644
--- a/ipc/chromium/src/third_party/moz.build
+++ b/ipc/chromium/src/third_party/moz.build
@@ -10,9 +10,6 @@ include(libevent_path_prefix + '/libeventcommon.mozbuild')
if os_win:
error('should not reach here on Windows')
-if CONFIG['MOZ_SYSTEM_LIBEVENT']:
- error('should not reach here if we are using a native libevent')
-
UNIFIED_SOURCES += [
'libevent/buffer.c',
'libevent/bufferevent.c',