diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-23 13:08:02 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-23 13:08:02 +0100 |
| commit | 90c5288fef22004d6e4d441b3ae10b9cd1836103 (patch) | |
| tree | 14d4a0e5588e0a04ec4cca52805599ed4abb27fe /ipc/chromium | |
| parent | 3624078103303adf0b934734d95a1ed9eb7bfefd (diff) | |
| download | uxp-90c5288fef22004d6e4d441b3ae10b9cd1836103.tar.gz | |
Issue #1342 - Remove support for system libevent
Diffstat (limited to 'ipc/chromium')
| -rw-r--r-- | ipc/chromium/moz.build | 6 | ||||
| -rw-r--r-- | ipc/chromium/src/third_party/libeventcommon.mozbuild | 2 | ||||
| -rw-r--r-- | ipc/chromium/src/third_party/moz.build | 3 |
3 files changed, 4 insertions, 7 deletions
diff --git a/ipc/chromium/moz.build b/ipc/chromium/moz.build index dc5b4dca40..b386134f98 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 2b45ecb198..33482c6615 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 2b99e53b3d..20a5043fb1 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', |