|
From 64b8914aad2fd169e7d9153d388739b280c52833 Mon Sep 17 00:00:00 2001 |
|
From: Kacper Kasper <kacperkasper@gmail.com> |
|
Date: Sat, 27 Apr 2019 01:09:57 +0200 |
|
Subject: [PATCH 1/5] base builds |
|
|
|
--- |
|
.gitignore | 1 + |
|
mkspecs/features/functions.prf | 1 + |
|
mkspecs/features/platform.prf | 4 +- |
|
src/3rdparty/chromium/BUILD.gn | 5 +- |
|
src/3rdparty/chromium/base/BUILD.gn | 4 + |
|
.../page_allocator_internals_posix.h | 5 + |
|
src/3rdparty/chromium/base/files/file.h | 3 +- |
|
.../chromium/base/files/file_posix.cc | 3 +- |
|
.../chromium/base/files/file_util_posix.cc | 3 +- |
|
.../base/files/memory_mapped_file_posix.cc | 3 +- |
|
.../base/memory/discardable_shared_memory.cc | 7 + |
|
.../base/message_loop/message_pump_for_ui.h | 2 +- |
|
.../chromium/base/posix/unix_domain_socket.cc | 10 +- |
|
.../chromium/base/process/launch_posix.cc | 5 +- |
|
.../chromium/base/process/process_metrics.h | 10 +- |
|
.../base/process/process_metrics_posix.cc | 2 + |
|
.../base/third_party/libevent/BUILD.gn | 7 + |
|
.../base/third_party/libevent/event-config.h | 2 + |
|
.../base/third_party/libevent/haiku/config.h | 272 +++++++++++++++++ |
|
.../third_party/libevent/haiku/event-config.h | 280 ++++++++++++++++++ |
|
.../base/trace_event/malloc_dump_provider.cc | 2 +- |
|
.../base/trace_event/process_memory_dump.cc | 2 +- |
|
src/3rdparty/chromium/build/build_config.h | 4 +- |
|
.../chromium/build/config/BUILDCONFIG.gn | 38 ++- |
|
.../chromium/build/config/compiler/BUILD.gn | 6 +- |
|
src/3rdparty/chromium/build/config/crypto.gni | 2 +- |
|
.../chromium/build/config/haiku/BUILD.gn | 19 ++ |
|
.../chromium/build/config/linux/pkg-config.py | 2 +- |
|
.../third_party/libjpeg_turbo/BUILD.gn | 2 +- |
|
.../build/secondary/third_party/nss/BUILD.gn | 2 +- |
|
.../chromium/build/toolchain/haiku/BUILD.gn | 44 +++ |
|
src/3rdparty/chromium/chrome/browser/BUILD.gn | 2 +- |
|
src/3rdparty/chromium/chrome/test/BUILD.gn | 2 +- |
|
src/3rdparty/chromium/components/BUILD.gn | 7 + |
|
.../components/crash/content/browser/BUILD.gn | 2 +- |
|
.../components/crash/core/common/BUILD.gn | 2 +- |
|
.../content/browser/BUILD.gn | 8 +- |
|
src/3rdparty/chromium/content/shell/BUILD.gn | 10 +- |
|
.../chromium/gpu/ipc/common/surface_handle.h | 4 +- |
|
src/3rdparty/chromium/headless/BUILD.gn | 6 +- |
|
.../chromium/third_party/libxml/BUILD.gn | 2 +- |
|
src/core/config/haiku.pri | 71 +++++ |
|
src/core/configure.json | 1 - |
|
src/core/core_module.pro | 2 + |
|
44 files changed, 829 insertions(+), 42 deletions(-) |
|
create mode 100644 .gitignore |
|
create mode 100644 src/3rdparty/chromium/base/third_party/libevent/haiku/config.h |
|
create mode 100644 src/3rdparty/chromium/base/third_party/libevent/haiku/event-config.h |
|
create mode 100644 src/3rdparty/chromium/build/config/haiku/BUILD.gn |
|
create mode 100644 src/3rdparty/chromium/build/toolchain/haiku/BUILD.gn |
|
create mode 100644 src/core/config/haiku.pri |
|
|
|
diff --git a/.gitignore b/.gitignore |
|
new file mode 100644 |
|
index 000000000..0d20b6487 |
|
--- /dev/null |
|
+++ b/.gitignore |
|
@@ -0,0 +1 @@ |
|
+*.pyc |
|
diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf |
|
index f6aeea21a..9532d3562 100644 |
|
--- a/mkspecs/features/functions.prf |
|
+++ b/mkspecs/features/functions.prf |
|
@@ -82,6 +82,7 @@ defineReplace(gnArgs) { |
|
linux: include($$QTWEBENGINE_ROOT/src/core/config/linux.pri) |
|
macos: include($$QTWEBENGINE_ROOT/src/core/config/mac_osx.pri) |
|
win32: include($$QTWEBENGINE_ROOT/src/core/config/windows.pri) |
|
+ haiku: include($$QTWEBENGINE_ROOT/src/core/config/haiku.pri) |
|
isEmpty(gn_args): error(No gn_args found please make sure you have valid configuration.) |
|
return($$gn_args) |
|
} |
|
diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf |
|
index 35eb6b89c..41bc19c95 100644 |
|
--- a/mkspecs/features/platform.prf |
|
+++ b/mkspecs/features/platform.prf |
|
@@ -57,8 +57,10 @@ defineTest(isPlatformSupported) { |
|
skipBuild("Building Qt WebEngine requires a macOS SDK version of 10.12 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.") |
|
return(false) |
|
} |
|
+ } else:haiku { |
|
+ gcc:!clang:!isGCCVersionSupported(): return(false) |
|
} else { |
|
- skipBuild("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.") |
|
+ skipBuild("Unknown platform. Qt WebEngine only supports Linux, Haiku, Windows, and macOS.") |
|
return(false) |
|
} |
|
|
|
diff --git a/src/3rdparty/chromium/BUILD.gn b/src/3rdparty/chromium/BUILD.gn |
|
index 5a20c9076..b999c70db 100644 |
|
--- a/src/3rdparty/chromium/BUILD.gn |
|
+++ b/src/3rdparty/chromium/BUILD.gn |
|
@@ -533,7 +533,7 @@ group("gn_all") { |
|
"//third_party/breakpad:minidump_stackwalk($host_toolchain)", |
|
] |
|
|
|
- if (!is_android) { |
|
+ if (!is_android && !is_haiku) { |
|
deps += [ |
|
"//chrome/test:chrome_app_unittests", |
|
"//gpu/khronos_glcts_support:khronos_glcts_test", |
|
@@ -607,7 +607,7 @@ group("gn_all") { |
|
host_os == "win" && !use_qt) { |
|
deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] |
|
} |
|
- } else if (!is_android && !is_ios && !is_fuchsia) { |
|
+ } else if (!is_android && !is_ios && !is_fuchsia && !is_haiku) { |
|
deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] |
|
} |
|
|
|
@@ -1165,6 +1165,7 @@ template("assert_valid_out_dir") { |
|
"*\bmac/*", |
|
"*\bposix/*", |
|
"*\bwin/*", |
|
+ "*\bhaiku/*", |
|
]) |
|
assert(target_name != "") # Mark as used. |
|
sources = invoker.actual_sources |
|
diff --git a/src/3rdparty/chromium/base/BUILD.gn b/src/3rdparty/chromium/base/BUILD.gn |
|
index 62f54f809..010384706 100644 |
|
--- a/src/3rdparty/chromium/base/BUILD.gn |
|
+++ b/src/3rdparty/chromium/base/BUILD.gn |
|
@@ -1455,6 +1455,10 @@ jumbo_component("base") { |
|
] |
|
} |
|
|
|
+ if (is_haiku) { |
|
+ defines += [ "_BSD_SOURCE", "__USE_XOPEN2K8" ] |
|
+ } |
|
+ |
|
# NaCl. |
|
if (is_nacl) { |
|
# We reset sources_assignment_filter in order to explicitly include |
|
diff --git a/src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator_internals_posix.h b/src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator_internals_posix.h |
|
index a5792666f..48292a8b7 100644 |
|
--- a/src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator_internals_posix.h |
|
+++ b/src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator_internals_posix.h |
|
@@ -21,6 +21,11 @@ |
|
#define MAP_ANONYMOUS MAP_ANON |
|
#endif |
|
|
|
+#if defined(OS_HAIKU) |
|
+#define madvise posix_madvise |
|
+#define MADV_DONTNEED POSIX_MADV_DONTNEED |
|
+#endif |
|
+ |
|
namespace base { |
|
|
|
// |mmap| uses a nearby address if the hint address is blocked. |
|
diff --git a/src/3rdparty/chromium/base/files/file.h b/src/3rdparty/chromium/base/files/file.h |
|
index 30f405321..3438bbdc1 100644 |
|
--- a/src/3rdparty/chromium/base/files/file.h |
|
+++ b/src/3rdparty/chromium/base/files/file.h |
|
@@ -25,7 +25,8 @@ |
|
namespace base { |
|
|
|
#if defined(OS_BSD) || defined(OS_MACOSX) || defined(OS_NACL) || \ |
|
- defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21) |
|
+ defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21) || \ |
|
+ defined(OS_HAIKU) |
|
typedef struct stat stat_wrapper_t; |
|
#elif defined(OS_POSIX) |
|
typedef struct stat64 stat_wrapper_t; |
|
diff --git a/src/3rdparty/chromium/base/files/file_posix.cc b/src/3rdparty/chromium/base/files/file_posix.cc |
|
index 83018f2f3..bc45d733f 100644 |
|
--- a/src/3rdparty/chromium/base/files/file_posix.cc |
|
+++ b/src/3rdparty/chromium/base/files/file_posix.cc |
|
@@ -31,7 +31,8 @@ static_assert(File::FROM_BEGIN == SEEK_SET && File::FROM_CURRENT == SEEK_CUR && |
|
namespace { |
|
|
|
#if defined(OS_BSD) || defined(OS_MACOSX) || defined(OS_NACL) || \ |
|
- defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21) |
|
+ defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21) || \ |
|
+ defined(OS_HAIKU) |
|
int CallFstat(int fd, stat_wrapper_t *sb) { |
|
AssertBlockingAllowed(); |
|
return fstat(fd, sb); |
|
diff --git a/src/3rdparty/chromium/base/files/file_util_posix.cc b/src/3rdparty/chromium/base/files/file_util_posix.cc |
|
index e888c82e0..cb01fd3dc 100644 |
|
--- a/src/3rdparty/chromium/base/files/file_util_posix.cc |
|
+++ b/src/3rdparty/chromium/base/files/file_util_posix.cc |
|
@@ -69,7 +69,8 @@ namespace base { |
|
namespace { |
|
|
|
#if defined(OS_BSD) || defined(OS_MACOSX) || defined(OS_NACL) || \ |
|
- defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21) |
|
+ defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21) || \ |
|
+ defined(OS_HAIKU) |
|
int CallStat(const char* path, stat_wrapper_t* sb) { |
|
AssertBlockingAllowed(); |
|
return stat(path, sb); |
|
diff --git a/src/3rdparty/chromium/base/files/memory_mapped_file_posix.cc b/src/3rdparty/chromium/base/files/memory_mapped_file_posix.cc |
|
index 45a0aea6d..0443c57f6 100644 |
|
--- a/src/3rdparty/chromium/base/files/memory_mapped_file_posix.cc |
|
+++ b/src/3rdparty/chromium/base/files/memory_mapped_file_posix.cc |
|
@@ -106,7 +106,8 @@ bool MemoryMappedFile::MapFileRegionToMemory( |
|
// fail if the disk is full and the file is sparse. |
|
bool do_manual_extension = false; |
|
|
|
-#if defined(OS_ANDROID) && __ANDROID_API__ < 21 |
|
+#if (defined(OS_ANDROID) && __ANDROID_API__ < 21) || defined(OS_HAIKU) |
|
+ // Haiku doesn't support fallocate at all yet (#6285) |
|
// Only Android API>=21 supports the fallocate call. Older versions need |
|
// to manually extend the file by writing zeros at block intervals. |
|
do_manual_extension = true; |
|
diff --git a/src/3rdparty/chromium/base/memory/discardable_shared_memory.cc b/src/3rdparty/chromium/base/memory/discardable_shared_memory.cc |
|
index 3b6b4dbfa..5ce103d6a 100644 |
|
--- a/src/3rdparty/chromium/base/memory/discardable_shared_memory.cc |
|
+++ b/src/3rdparty/chromium/base/memory/discardable_shared_memory.cc |
|
@@ -32,6 +32,11 @@ |
|
#include "base/win/windows_version.h" |
|
#endif |
|
|
|
+#if defined(OS_HAIKU) |
|
+#define madvise posix_madvise |
|
+#define MADV_DONTNEED POSIX_MADV_DONTNEED |
|
+#endif |
|
+ |
|
namespace base { |
|
namespace { |
|
|
|
@@ -380,6 +385,8 @@ bool DiscardableSharedMemory::Purge(Time current_time) { |
|
// reusable bit, which allows both Activity Monitor and memory-infra to |
|
// correctly track the pages. |
|
#define MADV_PURGE_ARGUMENT MADV_FREE_REUSABLE |
|
+#elif defined(OS_HAIKU) |
|
+#define MADV_PURGE_ARGUMENT POSIX_MADV_DONTNEED |
|
#else |
|
#define MADV_PURGE_ARGUMENT MADV_FREE |
|
#endif |
|
diff --git a/src/3rdparty/chromium/base/message_loop/message_pump_for_ui.h b/src/3rdparty/chromium/base/message_loop/message_pump_for_ui.h |
|
index 6ee02b094..f3b8113a8 100644 |
|
--- a/src/3rdparty/chromium/base/message_loop/message_pump_for_ui.h |
|
+++ b/src/3rdparty/chromium/base/message_loop/message_pump_for_ui.h |
|
@@ -44,7 +44,7 @@ using MessagePumpForUI = MessagePump; |
|
// TODO(abarth): Figure out if we need this. |
|
#elif defined(USE_GLIB) |
|
using MessagePumpForUI = MessagePumpGlib; |
|
-#elif defined(OS_LINUX) || defined(OS_BSD) |
|
+#elif defined(OS_LINUX) || defined(OS_BSD) || defined(OS_HAIKU) |
|
using MessagePumpForUI = MessagePumpLibevent; |
|
#elif defined(OS_FUCHSIA) |
|
using MessagePumpForUI = MessagePumpFuchsia; |
|
diff --git a/src/3rdparty/chromium/base/posix/unix_domain_socket.cc b/src/3rdparty/chromium/base/posix/unix_domain_socket.cc |
|
index 7c087a53b..3df3e657f 100644 |
|
--- a/src/3rdparty/chromium/base/posix/unix_domain_socket.cc |
|
+++ b/src/3rdparty/chromium/base/posix/unix_domain_socket.cc |
|
@@ -56,7 +56,7 @@ bool CreateSocketPair(ScopedFD* one, ScopedFD* two) { |
|
|
|
// static |
|
bool UnixDomainSocket::EnableReceiveProcessId(int fd) { |
|
-#if !defined(OS_MACOSX) |
|
+#if !defined(OS_MACOSX) && !defined(OS_HAIKU) |
|
const int enable = 1; |
|
return setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable)) == 0; |
|
#else |
|
@@ -147,11 +147,11 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, |
|
|
|
const size_t kControlBufferSize = |
|
CMSG_SPACE(sizeof(int) * kMaxFileDescriptors) |
|
-#if !defined(OS_NACL_NONSFI) && !defined(OS_MACOSX) |
|
+#if !defined(OS_NACL_NONSFI) && !defined(OS_MACOSX) && !defined(OS_HAIKU) |
|
// The PNaCl toolchain for Non-SFI binary build and macOS do not support |
|
// ucred. macOS supports xucred, but this structure is insufficient. |
|
+ CMSG_SPACE(sizeof(struct ucred)) |
|
-#endif // OS_NACL_NONSFI or OS_MACOSX |
|
+#endif // OS_NACL_NONSFI or OS_MACOSX or OS_HAIKU |
|
; |
|
char control_buffer[kControlBufferSize]; |
|
msg.msg_control = control_buffer; |
|
@@ -175,7 +175,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, |
|
wire_fds = reinterpret_cast<int*>(CMSG_DATA(cmsg)); |
|
wire_fds_len = payload_len / sizeof(int); |
|
} |
|
-#if !defined(OS_NACL_NONSFI) && !defined(OS_MACOSX) |
|
+#if !defined(OS_NACL_NONSFI) && !defined(OS_MACOSX) && !defined(OS_HAIKU) |
|
// The PNaCl toolchain for Non-SFI binary build and macOS do not support |
|
// SCM_CREDENTIALS. |
|
if (cmsg->cmsg_level == SOL_SOCKET && |
|
@@ -184,7 +184,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, |
|
DCHECK_EQ(pid, -1); |
|
pid = reinterpret_cast<struct ucred*>(CMSG_DATA(cmsg))->pid; |
|
} |
|
-#endif // !defined(OS_NACL_NONSFI) && !defined(OS_MACOSX) |
|
+#endif // !defined(OS_NACL_NONSFI) && !defined(OS_MACOSX) && !defined(OS_HAIKU) |
|
} |
|
} |
|
|
|
diff --git a/src/3rdparty/chromium/base/process/launch_posix.cc b/src/3rdparty/chromium/base/process/launch_posix.cc |
|
index ec584883b..b4ce6ff52 100644 |
|
--- a/src/3rdparty/chromium/base/process/launch_posix.cc |
|
+++ b/src/3rdparty/chromium/base/process/launch_posix.cc |
|
@@ -14,7 +14,9 @@ |
|
#include <stdint.h> |
|
#include <stdlib.h> |
|
#include <sys/resource.h> |
|
+#if !defined(OS_HAIKU) |
|
#include <sys/syscall.h> |
|
+#endif |
|
#include <sys/time.h> |
|
#include <sys/types.h> |
|
#include <sys/wait.h> |
|
@@ -236,7 +238,7 @@ static const char kFDDir[] = "/proc/self/fd"; |
|
void CloseSuperfluousFds(const base::InjectiveMultimap& saved_mapping) { |
|
// DANGER: no calls to malloc or locks are allowed from now on: |
|
// http://crbug.com/36678 |
|
- |
|
+#if !defined(OS_HAIKU) |
|
// Get the maximum number of FDs possible. |
|
size_t max_fds = GetMaxFds(); |
|
|
|
@@ -291,6 +293,7 @@ void CloseSuperfluousFds(const base::InjectiveMultimap& saved_mapping) { |
|
int ret = IGNORE_EINTR(close(fd)); |
|
DPCHECK(ret == 0); |
|
} |
|
+ #endif |
|
} |
|
|
|
Process LaunchProcess(const CommandLine& cmdline, |
|
diff --git a/src/3rdparty/chromium/base/process/process_metrics.h b/src/3rdparty/chromium/base/process/process_metrics.h |
|
index 6bfd93ece..16940b27f 100644 |
|
--- a/src/3rdparty/chromium/base/process/process_metrics.h |
|
+++ b/src/3rdparty/chromium/base/process/process_metrics.h |
|
@@ -275,7 +275,8 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_descriptors); |
|
#endif // defined(OS_POSIX) |
|
|
|
#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ |
|
- defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) |
|
+ defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) || \ |
|
+ defined(OS_HAIKU) |
|
// Data about system-wide memory consumption. Values are in KB. Available on |
|
// Windows, Mac, Linux, Android and Chrome OS. |
|
// |
|
@@ -323,7 +324,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { |
|
#endif |
|
|
|
#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || \ |
|
- defined(OS_FUCHSIA) |
|
+ defined(OS_FUCHSIA) || defined(OS_HAIKU) |
|
int buffers = 0; |
|
int cached = 0; |
|
int active_anon = 0; |
|
@@ -333,7 +334,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { |
|
int dirty = 0; |
|
int reclaimable = 0; |
|
#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || |
|
- // defined(OS_FUCHSIA) |
|
+ // defined(OS_FUCHSIA) || defined(OS_HAIKU) |
|
|
|
#if defined(OS_CHROMEOS) |
|
int shmem = 0; |
|
@@ -359,7 +360,8 @@ struct BASE_EXPORT SystemMemoryInfoKB { |
|
BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoKB* meminfo); |
|
|
|
#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || |
|
- // defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) |
|
+ // defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) || |
|
+ // defined(OS_HAIKU) |
|
|
|
#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) |
|
// Parse the data found in /proc/<pid>/stat and return the sum of the |
|
diff --git a/src/3rdparty/chromium/base/process/process_metrics_posix.cc b/src/3rdparty/chromium/base/process/process_metrics_posix.cc |
|
index a09bbf2c5..4dae83934 100644 |
|
--- a/src/3rdparty/chromium/base/process/process_metrics_posix.cc |
|
+++ b/src/3rdparty/chromium/base/process/process_metrics_posix.cc |
|
@@ -52,6 +52,8 @@ static const rlim_t kSystemDefaultMaxFds = 256; |
|
static const rlim_t kSystemDefaultMaxFds = 1024; |
|
#elif defined(OS_AIX) |
|
static const rlim_t kSystemDefaultMaxFds = 8192; |
|
+#elif defined(OS_HAIKU) |
|
+static const rlim_t kSystemDefaultMaxFds = 8192; |
|
#endif |
|
|
|
size_t GetMaxFds() { |
|
diff --git a/src/3rdparty/chromium/base/third_party/libevent/BUILD.gn b/src/3rdparty/chromium/base/third_party/libevent/BUILD.gn |
|
index 62e212870..8961acf64 100644 |
|
--- a/src/3rdparty/chromium/base/third_party/libevent/BUILD.gn |
|
+++ b/src/3rdparty/chromium/base/third_party/libevent/BUILD.gn |
|
@@ -78,6 +78,13 @@ static_library("bundled_libevent") { |
|
"nacl_nonsfi/signal_stub.c", |
|
] |
|
include_dirs = [ "nacl_nonsfi" ] |
|
+ } else if (is_haiku) { |
|
+ sources += [ |
|
+ "haiku/config.h", |
|
+ "haiku/event-config.h", |
|
+ ] |
|
+ include_dirs = [ "haiku", "compat" ] |
|
+ libs = [ "network" ] |
|
} |
|
|
|
configs -= [ "//build/config/compiler:chromium_code" ] |
|
diff --git a/src/3rdparty/chromium/base/third_party/libevent/event-config.h b/src/3rdparty/chromium/base/third_party/libevent/event-config.h |
|
index bbd23f1d8..f01bea268 100644 |
|
--- a/src/3rdparty/chromium/base/third_party/libevent/event-config.h |
|
+++ b/src/3rdparty/chromium/base/third_party/libevent/event-config.h |
|
@@ -19,6 +19,8 @@ |
|
#include "base/third_party/libevent/solaris/event-config.h" |
|
#elif defined(_AIX) |
|
#include "base/third_party/libevent/aix/event-config.h" |
|
+#elif defined(__HAIKU__) |
|
+#include "base/third_party/libevent/haiku/event-config.h" |
|
#else |
|
#error generate event-config.h for your platform |
|
#endif |
|
diff --git a/src/3rdparty/chromium/base/third_party/libevent/haiku/config.h b/src/3rdparty/chromium/base/third_party/libevent/haiku/config.h |
|
new file mode 100644 |
|
index 000000000..aee0d1c2f |
|
--- /dev/null |
|
+++ b/src/3rdparty/chromium/base/third_party/libevent/haiku/config.h |
|
@@ -0,0 +1,272 @@ |
|
+/* config.h. Generated from config.h.in by configure. */ |
|
+/* config.h.in. Generated from configure.in by autoheader. */ |
|
+ |
|
+/* Define if clock_gettime is available in libc */ |
|
+#define DNS_USE_CPU_CLOCK_FOR_ID 1 |
|
+ |
|
+/* Define is no secure id variant is available */ |
|
+/* #undef DNS_USE_GETTIMEOFDAY_FOR_ID */ |
|
+ |
|
+/* Define to 1 if you have the `clock_gettime' function. */ |
|
+#define HAVE_CLOCK_GETTIME 1 |
|
+ |
|
+/* Define if /dev/poll is available */ |
|
+/* #undef HAVE_DEVPOLL */ |
|
+ |
|
+/* Define to 1 if you have the <dlfcn.h> header file. */ |
|
+#define HAVE_DLFCN_H 1 |
|
+ |
|
+/* Define if your system supports the epoll system calls */ |
|
+/* #undef HAVE_EPOLL */ |
|
+ |
|
+/* Define to 1 if you have the `epoll_ctl' function. */ |
|
+/* #undef HAVE_EPOLL_CTL */ |
|
+ |
|
+/* Define if your system supports event ports */ |
|
+/* #undef HAVE_EVENT_PORTS */ |
|
+ |
|
+/* Define to 1 if you have the `fcntl' function. */ |
|
+#define HAVE_FCNTL 1 |
|
+ |
|
+/* Define to 1 if you have the <fcntl.h> header file. */ |
|
+#define HAVE_FCNTL_H 1 |
|
+ |
|
+/* Define to 1 if the system has the type `fd_mask'. */ |
|
+/* #undef HAVE_FD_MASK */ |
|
+ |
|
+/* Define to 1 if you have the `getaddrinfo' function. */ |
|
+#define HAVE_GETADDRINFO 1 |
|
+ |
|
+/* Define to 1 if you have the `getegid' function. */ |
|
+#define HAVE_GETEGID 1 |
|
+ |
|
+/* Define to 1 if you have the `geteuid' function. */ |
|
+#define HAVE_GETEUID 1 |
|
+ |
|
+/* Define to 1 if you have the `getnameinfo' function. */ |
|
+#define HAVE_GETNAMEINFO 1 |
|
+ |
|
+/* Define to 1 if you have the `gettimeofday' function. */ |
|
+#define HAVE_GETTIMEOFDAY 1 |
|
+ |
|
+/* Define to 1 if you have the `inet_ntop' function. */ |
|
+#define HAVE_INET_NTOP 1 |
|
+ |
|
+/* Define to 1 if you have the <inttypes.h> header file. */ |
|
+#define HAVE_INTTYPES_H 1 |
|
+ |
|
+/* Define to 1 if you have the `issetugid' function. */ |
|
+/* #undef HAVE_ISSETUGID */ |
|
+ |
|
+/* Define to 1 if you have the `kqueue' function. */ |
|
+/* #undef HAVE_KQUEUE */ |
|
+ |
|
+/* Define to 1 if you have the `nsl' library (-lnsl). */ |
|
+/* #undef HAVE_LIBNSL */ |
|
+ |
|
+/* Define to 1 if you have the `resolv' library (-lresolv). */ |
|
+/* #undef HAVE_LIBRESOLV */ |
|
+ |
|
+/* Define to 1 if you have the `rt' library (-lrt). */ |
|
+/* #undef HAVE_LIBRT */ |
|
+ |
|
+/* Define to 1 if you have the <memory.h> header file. */ |
|
+#define HAVE_MEMORY_H 1 |
|
+ |
|
+/* Define to 1 if you have the <netinet/in6.h> header file. */ |
|
+/* #undef HAVE_NETINET_IN6_H */ |
|
+ |
|
+/* Define to 1 if you have the `poll' function. */ |
|
+#define HAVE_POLL 1 |
|
+ |
|
+/* Define to 1 if you have the <poll.h> header file. */ |
|
+#define HAVE_POLL_H 1 |
|
+ |
|
+/* Define to 1 if you have the `port_create' function. */ |
|
+/* #undef HAVE_PORT_CREATE */ |
|
+ |
|
+/* Define to 1 if you have the <port.h> header file. */ |
|
+/* #undef HAVE_PORT_H */ |
|
+ |
|
+/* Define to 1 if you have the `select' function. */ |
|
+#define HAVE_SELECT 1 |
|
+ |
|
+/* Define if F_SETFD is defined in <fcntl.h> */ |
|
+#define HAVE_SETFD 1 |
|
+ |
|
+/* Define to 1 if you have the `sigaction' function. */ |
|
+#define HAVE_SIGACTION 1 |
|
+ |
|
+/* Define to 1 if you have the `signal' function. */ |
|
+#define HAVE_SIGNAL 1 |
|
+ |
|
+/* Define to 1 if you have the <signal.h> header file. */ |
|
+#define HAVE_SIGNAL_H 1 |
|
+ |
|
+/* Define to 1 if you have the <stdarg.h> header file. */ |
|
+#define HAVE_STDARG_H 1 |
|
+ |
|
+/* Define to 1 if you have the <stdint.h> header file. */ |
|
+#define HAVE_STDINT_H 1 |
|
+ |
|
+/* Define to 1 if you have the <stdlib.h> header file. */ |
|
+#define HAVE_STDLIB_H 1 |
|
+ |
|
+/* Define to 1 if you have the <strings.h> header file. */ |
|
+#define HAVE_STRINGS_H 1 |
|
+ |
|
+/* Define to 1 if you have the <string.h> header file. */ |
|
+#define HAVE_STRING_H 1 |
|
+ |
|
+/* Define to 1 if you have the `strlcpy' function. */ |
|
+#define HAVE_STRLCPY 1 |
|
+ |
|
+/* Define to 1 if you have the `strsep' function. */ |
|
+/* #undef HAVE_STRSEP */ |
|
+ |
|
+/* Define to 1 if you have the `strtok_r' function. */ |
|
+#define HAVE_STRTOK_R 1 |
|
+ |
|
+/* Define to 1 if you have the `strtoll' function. */ |
|
+#define HAVE_STRTOLL 1 |
|
+ |
|
+/* Define to 1 if the system has the type `struct in6_addr'. */ |
|
+#define HAVE_STRUCT_IN6_ADDR 1 |
|
+ |
|
+/* Define to 1 if you have the <sys/devpoll.h> header file. */ |
|
+/* #undef HAVE_SYS_DEVPOLL_H */ |
|
+ |
|
+/* Define to 1 if you have the <sys/epoll.h> header file. */ |
|
+/* #undef HAVE_SYS_EPOLL_H */ |
|
+ |
|
+/* Define to 1 if you have the <sys/event.h> header file. */ |
|
+/* #undef HAVE_SYS_EVENT_H */ |
|
+ |
|
+/* Define to 1 if you have the <sys/ioctl.h> header file. */ |
|
+#define HAVE_SYS_IOCTL_H 1 |
|
+ |
|
+/* Define to 1 if you have the <sys/param.h> header file. */ |
|
+#define HAVE_SYS_PARAM_H 1 |
|
+ |
|
+/* Define to 1 if you have the <sys/queue.h> header file. */ |
|
+#define HAVE_SYS_QUEUE_H 1 |
|
+ |
|
+/* Define to 1 if you have the <sys/select.h> header file. */ |
|
+#define HAVE_SYS_SELECT_H 1 |
|
+ |
|
+/* Define to 1 if you have the <sys/socket.h> header file. */ |
|
+#define HAVE_SYS_SOCKET_H 1 |
|
+ |
|
+/* Define to 1 if you have the <sys/stat.h> header file. */ |
|
+#define HAVE_SYS_STAT_H 1 |
|
+ |
|
+/* Define to 1 if you have the <sys/time.h> header file. */ |
|
+#define HAVE_SYS_TIME_H 1 |
|
+ |
|
+/* Define to 1 if you have the <sys/types.h> header file. */ |
|
+#define HAVE_SYS_TYPES_H 1 |
|
+ |
|
+/* Define if TAILQ_FOREACH is defined in <sys/queue.h> */ |
|
+/* #undef HAVE_TAILQFOREACH */ |
|
+ |
|
+/* Define if timeradd is defined in <sys/time.h> */ |
|
+#define HAVE_TIMERADD 1 |
|
+ |
|
+/* Define if timerclear is defined in <sys/time.h> */ |
|
+#define HAVE_TIMERCLEAR 1 |
|
+ |
|
+/* Define if timercmp is defined in <sys/time.h> */ |
|
+#define HAVE_TIMERCMP 1 |
|
+ |
|
+/* Define if timerisset is defined in <sys/time.h> */ |
|
+#define HAVE_TIMERISSET 1 |
|
+ |
|
+/* Define to 1 if the system has the type `uint16_t'. */ |
|
+#define HAVE_UINT16_T 1 |
|
+ |
|
+/* Define to 1 if the system has the type `uint32_t'. */ |
|
+#define HAVE_UINT32_T 1 |
|
+ |
|
+/* Define to 1 if the system has the type `uint64_t'. */ |
|
+#define HAVE_UINT64_T 1 |
|
+ |
|
+/* Define to 1 if the system has the type `uint8_t'. */ |
|
+#define HAVE_UINT8_T 1 |
|
+ |
|
+/* Define to 1 if you have the <unistd.h> header file. */ |
|
+#define HAVE_UNISTD_H 1 |
|
+ |
|
+/* Define to 1 if you have the `vasprintf' function. */ |
|
+#define HAVE_VASPRINTF 1 |
|
+ |
|
+/* Define if kqueue works correctly with pipes */ |
|
+/* #undef HAVE_WORKING_KQUEUE */ |
|
+ |
|
+/* Define to the sub-directory where libtool stores uninstalled libraries. */ |
|
+#define LT_OBJDIR ".libs/" |
|
+ |
|
+/* Numeric representation of the version */ |
|
+#define NUMERIC_VERSION 0x01040e00 |
|
+ |
|
+/* Name of package */ |
|
+#define PACKAGE "libevent" |
|
+ |
|
+/* Define to the address where bug reports for this package should be sent. */ |
|
+#define PACKAGE_BUGREPORT "" |
|
+ |
|
+/* Define to the full name of this package. */ |
|
+#define PACKAGE_NAME "" |
|
+ |
|
+/* Define to the full name and version of this package. */ |
|
+#define PACKAGE_STRING "" |
|
+ |
|
+/* Define to the one symbol short name of this package. */ |
|
+#define PACKAGE_TARNAME "" |
|
+ |
|
+/* Define to the home page for this package. */ |
|
+#define PACKAGE_URL "" |
|
+ |
|
+/* Define to the version of this package. */ |
|
+#define PACKAGE_VERSION "" |
|
+ |
|
+/* The size of `int', as computed by sizeof. */ |
|
+#define SIZEOF_INT 4 |
|
+ |
|
+/* The size of `long', as computed by sizeof. */ |
|
+#define SIZEOF_LONG 8 |
|
+ |
|
+/* The size of `long long', as computed by sizeof. */ |
|
+#define SIZEOF_LONG_LONG 8 |
|
+ |
|
+/* The size of `short', as computed by sizeof. */ |
|
+#define SIZEOF_SHORT 2 |
|
+ |
|
+/* Define to 1 if you have the ANSI C header files. */ |
|
+#define STDC_HEADERS 1 |
|
+ |
|
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ |
|
+#define TIME_WITH_SYS_TIME 1 |
|
+ |
|
+/* Version number of package */ |
|
+#define VERSION "1.4.14b-stable" |
|
+ |
|
+/* Define to appropriate substitue if compiler doesnt have __func__ */ |
|
+/* #undef __func__ */ |
|
+ |
|
+/* Define to empty if `const' does not conform to ANSI C. */ |
|
+/* #undef const */ |
|
+ |
|
+/* Define to `__inline__' or `__inline' if that's what the C compiler |
|
+ calls it, or to nothing if 'inline' is not supported under any name. */ |
|
+#ifndef __cplusplus |
|
+/* #undef inline */ |
|
+#endif |
|
+ |
|
+/* Define to `int' if <sys/types.h> does not define. */ |
|
+/* #undef pid_t */ |
|
+ |
|
+/* Define to `unsigned int' if <sys/types.h> does not define. */ |
|
+/* #undef size_t */ |
|
+ |
|
+/* Define to unsigned int if you dont have it */ |
|
+/* #undef socklen_t */ |
|
diff --git a/src/3rdparty/chromium/base/third_party/libevent/haiku/event-config.h b/src/3rdparty/chromium/base/third_party/libevent/haiku/event-config.h |
|
new file mode 100644 |
|
index 000000000..0a77f14a4 |
|
--- /dev/null |
|
+++ b/src/3rdparty/chromium/base/third_party/libevent/haiku/event-config.h |
|
@@ -0,0 +1,280 @@ |
|
+/* event-config.h |
|
+ * Generated by autoconf; post-processed by libevent. |
|
+ * Do not edit this file. |
|
+ * Do not rely on macros in this file existing in later versions. |
|
+ */ |
|
+#ifndef _EVENT_CONFIG_H_ |
|
+#define _EVENT_CONFIG_H_ |
|
+/* config.h. Generated from config.h.in by configure. */ |
|
+/* config.h.in. Generated from configure.in by autoheader. */ |
|
+ |
|
+/* Define if clock_gettime is available in libc */ |
|
+#define _EVENT_DNS_USE_CPU_CLOCK_FOR_ID 1 |
|
+ |
|
+/* Define is no secure id variant is available */ |
|
+/* #undef _EVENT_DNS_USE_GETTIMEOFDAY_FOR_ID */ |
|
+ |
|
+/* Define to 1 if you have the `clock_gettime' function. */ |
|
+#define _EVENT_HAVE_CLOCK_GETTIME 1 |
|
+ |
|
+/* Define if /dev/poll is available */ |
|
+/* #undef _EVENT_HAVE_DEVPOLL */ |
|
+ |
|
+/* Define to 1 if you have the <dlfcn.h> header file. */ |
|
+#define _EVENT_HAVE_DLFCN_H 1 |
|
+ |
|
+/* Define if your system supports the epoll system calls */ |
|
+/* #undef _EVENT_HAVE_EPOLL */ |
|
+ |
|
+/* Define to 1 if you have the `epoll_ctl' function. */ |
|
+/* #undef _EVENT_HAVE_EPOLL_CTL */ |
|
+ |
|
+/* Define if your system supports event ports */ |
|
+/* #undef _EVENT_HAVE_EVENT_PORTS */ |
|
+ |
|
+/* Define to 1 if you have the `fcntl' function. */ |
|
+#define _EVENT_HAVE_FCNTL 1 |
|
+ |
|
+/* Define to 1 if you have the <fcntl.h> header file. */ |
|
+#define _EVENT_HAVE_FCNTL_H 1 |
|
+ |
|
+/* Define to 1 if the system has the type `fd_mask'. */ |
|
+#define _EVENT_HAVE_FD_MASK |
|
+ |
|
+/* Define to 1 if you have the `getaddrinfo' function. */ |
|
+#define _EVENT_HAVE_GETADDRINFO 1 |
|
+ |
|
+/* Define to 1 if you have the `getegid' function. */ |
|
+#define _EVENT_HAVE_GETEGID 1 |
|
+ |
|
+/* Define to 1 if you have the `geteuid' function. */ |
|
+#define _EVENT_HAVE_GETEUID 1 |
|
+ |
|
+/* Define to 1 if you have the `getnameinfo' function. */ |
|
+#define _EVENT_HAVE_GETNAMEINFO 1 |
|
+ |
|
+/* Define to 1 if you have the `gettimeofday' function. */ |
|
+#define _EVENT_HAVE_GETTIMEOFDAY 1 |
|
+ |
|
+/* Define to 1 if you have the `inet_ntop' function. */ |
|
+#define _EVENT_HAVE_INET_NTOP 1 |
|
+ |
|
+/* Define to 1 if you have the <inttypes.h> header file. */ |
|
+#define _EVENT_HAVE_INTTYPES_H 1 |
|
+ |
|
+/* Define to 1 if you have the `issetugid' function. */ |
|
+/* #undef _EVENT_HAVE_ISSETUGID */ |
|
+ |
|
+/* Define to 1 if you have the `kqueue' function. */ |
|
+/* #undef _EVENT_HAVE_KQUEUE */ |
|
+ |
|
+/* Define to 1 if you have the `nsl' library (-lnsl). */ |
|
+/* #undef _EVENT_HAVE_LIBNSL */ |
|
+ |
|
+/* Define to 1 if you have the `resolv' library (-lresolv). */ |
|
+/* #undef _EVENT_HAVE_LIBRESOLV */ |
|
+ |
|
+/* Define to 1 if you have the `rt' library (-lrt). */ |
|
+/* #undef _EVENT_HAVE_LIBRT */ |
|
+ |
|
+/* Define to 1 if you have the <memory.h> header file. */ |
|
+#define _EVENT_HAVE_MEMORY_H 1 |
|
+ |
|
+/* Define to 1 if you have the <netinet/in6.h> header file. */ |
|
+/* #undef _EVENT_HAVE_NETINET_IN6_H */ |
|
+ |
|
+/* Define to 1 if you have the `poll' function. */ |
|
+#define _EVENT_HAVE_POLL 1 |
|
+ |
|
+/* Define to 1 if you have the <poll.h> header file. */ |
|
+#define _EVENT_HAVE_POLL_H 1 |
|
+ |
|
+/* Define to 1 if you have the `port_create' function. */ |
|
+/* #undef _EVENT_HAVE_PORT_CREATE */ |
|
+ |
|
+/* Define to 1 if you have the <port.h> header file. */ |
|
+/* #undef _EVENT_HAVE_PORT_H */ |
|
+ |
|
+/* Define to 1 if you have the `select' function. */ |
|
+#define _EVENT_HAVE_SELECT 1 |
|
+ |
|
+/* Define if F_SETFD is defined in <fcntl.h> */ |
|
+#define _EVENT_HAVE_SETFD 1 |
|
+ |
|
+/* Define to 1 if you have the `sigaction' function. */ |
|
+#define _EVENT_HAVE_SIGACTION 1 |
|
+ |
|
+/* Define to 1 if you have the `signal' function. */ |
|
+#define _EVENT_HAVE_SIGNAL 1 |
|
+ |
|
+/* Define to 1 if you have the <signal.h> header file. */ |
|
+#define _EVENT_HAVE_SIGNAL_H 1 |
|
+ |
|
+/* Define to 1 if you have the <stdarg.h> header file. */ |
|
+#define _EVENT_HAVE_STDARG_H 1 |
|
+ |
|
+/* Define to 1 if you have the <stdint.h> header file. */ |
|
+#define _EVENT_HAVE_STDINT_H 1 |
|
+ |
|
+/* Define to 1 if you have the <stdlib.h> header file. */ |
|
+#define _EVENT_HAVE_STDLIB_H 1 |
|
+ |
|
+/* Define to 1 if you have the <strings.h> header file. */ |
|
+#define _EVENT_HAVE_STRINGS_H 1 |
|
+ |
|
+/* Define to 1 if you have the <string.h> header file. */ |
|
+#define _EVENT_HAVE_STRING_H 1 |
|
+ |
|
+/* Define to 1 if you have the `strlcpy' function. */ |
|
+#define _EVENT_HAVE_STRLCPY 1 |
|
+ |
|
+/* Define to 1 if you have the `strsep' function. */ |
|
+/* #undef _EVENT_HAVE_STRSEP */ |
|
+ |
|
+/* Define to 1 if you have the `strtok_r' function. */ |
|
+#define _EVENT_HAVE_STRTOK_R 1 |
|
+ |
|
+/* Define to 1 if you have the `strtoll' function. */ |
|
+#define _EVENT_HAVE_STRTOLL 1 |
|
+ |
|
+/* Define to 1 if the system has the type `struct in6_addr'. */ |
|
+#define _EVENT_HAVE_STRUCT_IN6_ADDR 1 |
|
+ |
|
+/* Define to 1 if you have the <sys/devpoll.h> header file. */ |
|
+/* #undef _EVENT_HAVE_SYS_DEVPOLL_H */ |
|
+ |
|
+/* Define to 1 if you have the <sys/epoll.h> header file. */ |
|
+/* #undef _EVENT_HAVE_SYS_EPOLL_H */ |
|
+ |
|
+/* Define to 1 if you have the <sys/event.h> header file. */ |
|
+/* #undef _EVENT_HAVE_SYS_EVENT_H */ |
|
+ |
|
+/* Define to 1 if you have the <sys/ioctl.h> header file. */ |
|
+#define _EVENT_HAVE_SYS_IOCTL_H 1 |
|
+ |
|
+/* Define to 1 if you have the <sys/param.h> header file. */ |
|
+#define _EVENT_HAVE_SYS_PARAM_H 1 |
|
+ |
|
+/* Define to 1 if you have the <sys/queue.h> header file. */ |
|
+#define _EVENT_HAVE_SYS_QUEUE_H 1 |
|
+ |
|
+/* Define to 1 if you have the <sys/select.h> header file. */ |
|
+#define _EVENT_HAVE_SYS_SELECT_H 1 |
|
+ |
|
+/* Define to 1 if you have the <sys/socket.h> header file. */ |
|
+#define _EVENT_HAVE_SYS_SOCKET_H 1 |
|
+ |
|
+/* Define to 1 if you have the <sys/stat.h> header file. */ |
|
+#define _EVENT_HAVE_SYS_STAT_H 1 |
|
+ |
|
+/* Define to 1 if you have the <sys/time.h> header file. */ |
|
+#define _EVENT_HAVE_SYS_TIME_H 1 |
|
+ |
|
+/* Define to 1 if you have the <sys/types.h> header file. */ |
|
+#define _EVENT_HAVE_SYS_TYPES_H 1 |
|
+ |
|
+/* Define if TAILQ_FOREACH is defined in <sys/queue.h> */ |
|
+/* #undef _EVENT_HAVE_TAILQFOREACH */ |
|
+ |
|
+/* Define if timeradd is defined in <sys/time.h> */ |
|
+#define _EVENT_HAVE_TIMERADD 1 |
|
+ |
|
+/* Define if timerclear is defined in <sys/time.h> */ |
|
+#define _EVENT_HAVE_TIMERCLEAR 1 |
|
+ |
|
+/* Define if timercmp is defined in <sys/time.h> */ |
|
+#define _EVENT_HAVE_TIMERCMP 1 |
|
+ |
|
+/* Define if timerisset is defined in <sys/time.h> */ |
|
+#define _EVENT_HAVE_TIMERISSET 1 |
|
+ |
|
+/* Define to 1 if the system has the type `uint16_t'. */ |
|
+#define _EVENT_HAVE_UINT16_T 1 |
|
+ |
|
+/* Define to 1 if the system has the type `uint32_t'. */ |
|
+#define _EVENT_HAVE_UINT32_T 1 |
|
+ |
|
+/* Define to 1 if the system has the type `uint64_t'. */ |
|
+#define _EVENT_HAVE_UINT64_T 1 |
|
+ |
|
+/* Define to 1 if the system has the type `uint8_t'. */ |
|
+#define _EVENT_HAVE_UINT8_T 1 |
|
+ |
|
+/* Define to 1 if you have the <unistd.h> header file. */ |
|
+#define _EVENT_HAVE_UNISTD_H 1 |
|
+ |
|
+/* Define to 1 if you have the `vasprintf' function. */ |
|
+#define _EVENT_HAVE_VASPRINTF 1 |
|
+ |
|
+/* Define if kqueue works correctly with pipes */ |
|
+/* #undef _EVENT_HAVE_WORKING_KQUEUE */ |
|
+ |
|
+/* Define to the sub-directory where libtool stores uninstalled libraries. */ |
|
+#define _EVENT_LT_OBJDIR ".libs/" |
|
+ |
|
+/* Numeric representation of the version */ |
|
+#define _EVENT_NUMERIC_VERSION 0x01040e00 |
|
+ |
|
+/* Name of package */ |
|
+#define _EVENT_PACKAGE "libevent" |
|
+ |
|
+/* Define to the address where bug reports for this package should be sent. */ |
|
+#define _EVENT_PACKAGE_BUGREPORT "" |
|
+ |
|
+/* Define to the full name of this package. */ |
|
+#define _EVENT_PACKAGE_NAME "" |
|
+ |
|
+/* Define to the full name and version of this package. */ |
|
+#define _EVENT_PACKAGE_STRING "" |
|
+ |
|
+/* Define to the one symbol short name of this package. */ |
|
+#define _EVENT_PACKAGE_TARNAME "" |
|
+ |
|
+/* Define to the home page for this package. */ |
|
+#define _EVENT_PACKAGE_URL "" |
|
+ |
|
+/* Define to the version of this package. */ |
|
+#define _EVENT_PACKAGE_VERSION "" |
|
+ |
|
+/* The size of `int', as computed by sizeof. */ |
|
+#define _EVENT_SIZEOF_INT 4 |
|
+ |
|
+/* The size of `long', as computed by sizeof. */ |
|
+#define _EVENT_SIZEOF_LONG 8 |
|
+ |
|
+/* The size of `long long', as computed by sizeof. */ |
|
+#define _EVENT_SIZEOF_LONG_LONG 8 |
|
+ |
|
+/* The size of `short', as computed by sizeof. */ |
|
+#define _EVENT_SIZEOF_SHORT 2 |
|
+ |
|
+/* Define to 1 if you have the ANSI C header files. */ |
|
+#define _EVENT_STDC_HEADERS 1 |
|
+ |
|
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ |
|
+#define _EVENT_TIME_WITH_SYS_TIME 1 |
|
+ |
|
+/* Version number of package */ |
|
+#define _EVENT_VERSION "1.4.14b-stable" |
|
+ |
|
+/* Define to appropriate substitue if compiler doesnt have __func__ */ |
|
+/* #undef _EVENT___func__ */ |
|
+ |
|
+/* Define to empty if `const' does not conform to ANSI C. */ |
|
+/* #undef _EVENT_const */ |
|
+ |
|
+/* Define to `__inline__' or `__inline' if that's what the C compiler |
|
+ calls it, or to nothing if 'inline' is not supported under any name. */ |
|
+#ifndef _EVENT___cplusplus |
|
+/* #undef _EVENT_inline */ |
|
+#endif |
|
+ |
|
+/* Define to `int' if <sys/types.h> does not define. */ |
|
+/* #undef _EVENT_pid_t */ |
|
+ |
|
+/* Define to `unsigned int' if <sys/types.h> does not define. */ |
|
+/* #undef _EVENT_size_t */ |
|
+ |
|
+/* Define to unsigned int if you dont have it */ |
|
+/* #undef _EVENT_socklen_t */ |
|
+#endif |
|
diff --git a/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc b/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc |
|
index 46fdb3e21..14661c914 100644 |
|
--- a/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc |
|
+++ b/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc |
|
@@ -130,7 +130,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, |
|
allocated_objects_size = main_heap_info.allocated_size; |
|
allocated_objects_count = main_heap_info.block_count; |
|
} |
|
-#elif defined(OS_FUCHSIA) |
|
+#elif defined(OS_FUCHSIA) || defined(OS_HAIKU) |
|
// TODO(fuchsia): Port, see https://crbug.com/706592. |
|
#else |
|
struct mallinfo info = mallinfo(); |
|
diff --git a/src/3rdparty/chromium/base/trace_event/process_memory_dump.cc b/src/3rdparty/chromium/base/trace_event/process_memory_dump.cc |
|
index 362641c40..1248c9e06 100644 |
|
--- a/src/3rdparty/chromium/base/trace_event/process_memory_dump.cc |
|
+++ b/src/3rdparty/chromium/base/trace_event/process_memory_dump.cc |
|
@@ -115,7 +115,7 @@ size_t ProcessMemoryDump::CountResidentBytes(void* start_address, |
|
|
|
for (size_t i = 0; i < page_count; i++) |
|
resident_page_count += vec[i].VirtualAttributes.Valid; |
|
-#elif defined(OS_FUCHSIA) |
|
+#elif defined(OS_FUCHSIA) || defined(OS_HAIKU) |
|
// TODO(fuchsia): Port, see https://crbug.com/706592. |
|
ALLOW_UNUSED_LOCAL(chunk_start); |
|
ALLOW_UNUSED_LOCAL(page_count); |
|
diff --git a/src/3rdparty/chromium/build/build_config.h b/src/3rdparty/chromium/build/build_config.h |
|
index c7b02664c..d1c6409a4 100644 |
|
--- a/src/3rdparty/chromium/build/build_config.h |
|
+++ b/src/3rdparty/chromium/build/build_config.h |
|
@@ -65,6 +65,8 @@ |
|
#define OS_AIX 1 |
|
#elif defined(__asmjs__) |
|
#define OS_ASMJS |
|
+#elif defined(__HAIKU__) |
|
+#define OS_HAIKU 1 |
|
#else |
|
#error Please add support for your platform in build/build_config.h |
|
#endif |
|
@@ -82,7 +84,7 @@ |
|
#if defined(OS_AIX) || defined(OS_ANDROID) || defined(OS_ASMJS) || \ |
|
defined(OS_FREEBSD) || defined(OS_LINUX) || defined(OS_MACOSX) || \ |
|
defined(OS_NACL) || defined(OS_NETBSD) || defined(OS_OPENBSD) || \ |
|
- defined(OS_QNX) || defined(OS_SOLARIS) |
|
+ defined(OS_QNX) || defined(OS_SOLARIS) || defined(OS_HAIKU) |
|
#define OS_POSIX 1 |
|
#endif |
|
|
|
diff --git a/src/3rdparty/chromium/build/config/BUILDCONFIG.gn b/src/3rdparty/chromium/build/config/BUILDCONFIG.gn |
|
index 88daf9a25..018e292c0 100644 |
|
--- a/src/3rdparty/chromium/build/config/BUILDCONFIG.gn |
|
+++ b/src/3rdparty/chromium/build/config/BUILDCONFIG.gn |
|
@@ -134,10 +134,10 @@ declare_args() { |
|
is_desktop_linux = current_os == "linux" |
|
|
|
# Set to true when compiling with the Clang compiler. |
|
- is_clang = current_os != "linux" || |
|
+ is_clang = current_os != "haiku" && (current_os != "linux" || |
|
(current_cpu != "s390x" && current_cpu != "s390" && |
|
current_cpu != "ppc64" && current_cpu != "ppc" && |
|
- current_cpu != "mips" && current_cpu != "mips64") |
|
+ current_cpu != "mips" && current_cpu != "mips64")) |
|
|
|
# Allows the path to a custom target toolchain to be injected as a single |
|
# argument, and set as the default toolchain. |
|
@@ -221,6 +221,8 @@ if (host_toolchain == "") { |
|
} |
|
} else if (host_os == "aix") { |
|
host_toolchain = "//build/toolchain/aix:$host_cpu" |
|
+ } else if (host_os == "haiku") { |
|
+ host_toolchain = "//build/toolchain/haiku:$host_cpu" |
|
} else { |
|
assert(false, "Unsupported host_os: $host_os") |
|
} |
|
@@ -239,6 +241,8 @@ if (target_os == "android") { |
|
} else { |
|
_default_toolchain = "//build/toolchain/linux:$target_cpu" |
|
} |
|
+} else if (target_os == "haiku") { |
|
+ _default_toolchain = "//build/toolchain/haiku:$target_cpu" |
|
} else if (target_os == "fuchsia") { |
|
_default_toolchain = "//build/toolchain/fuchsia:$target_cpu" |
|
} else if (target_os == "ios") { |
|
@@ -306,6 +310,7 @@ if (current_os == "win" || current_os == "winuwp") { |
|
is_nacl = false |
|
is_posix = false |
|
is_win = true |
|
+ is_haiku = false |
|
} else if (current_os == "mac") { |
|
is_aix = false |
|
is_android = false |
|
@@ -317,6 +322,7 @@ if (current_os == "win" || current_os == "winuwp") { |
|
is_nacl = false |
|
is_posix = true |
|
is_win = false |
|
+ is_haiku = false |
|
} else if (current_os == "android") { |
|
is_aix = false |
|
is_android = true |
|
@@ -328,6 +334,7 @@ if (current_os == "win" || current_os == "winuwp") { |
|
is_nacl = false |
|
is_posix = true |
|
is_win = false |
|
+ is_haiku = false |
|
} else if (current_os == "chromeos") { |
|
is_aix = false |
|
is_android = false |
|
@@ -339,6 +346,7 @@ if (current_os == "win" || current_os == "winuwp") { |
|
is_nacl = false |
|
is_posix = true |
|
is_win = false |
|
+ is_haiku = false |
|
} else if (current_os == "nacl") { |
|
# current_os == "nacl" will be passed by the nacl toolchain definition. |
|
# It is not set by default or on the command line. We treat is as a |
|
@@ -353,6 +361,7 @@ if (current_os == "win" || current_os == "winuwp") { |
|
is_nacl = true |
|
is_posix = true |
|
is_win = false |
|
+ is_haiku = false |
|
} else if (current_os == "fuchsia") { |
|
is_aix = false |
|
is_android = false |
|
@@ -364,6 +373,7 @@ if (current_os == "win" || current_os == "winuwp") { |
|
is_nacl = false |
|
is_posix = false |
|
is_win = false |
|
+ is_haiku = false |
|
} else if (current_os == "ios") { |
|
is_aix = false |
|
is_android = false |
|
@@ -375,6 +385,7 @@ if (current_os == "win" || current_os == "winuwp") { |
|
is_nacl = false |
|
is_posix = true |
|
is_win = false |
|
+ is_haiku = false |
|
} else if (current_os == "linux") { |
|
is_aix = false |
|
is_android = false |
|
@@ -386,6 +397,7 @@ if (current_os == "win" || current_os == "winuwp") { |
|
is_nacl = false |
|
is_posix = true |
|
is_win = false |
|
+ is_haiku = false |
|
} else if (current_os == "aix") { |
|
is_aix = true |
|
is_android = false |
|
@@ -397,6 +409,19 @@ if (current_os == "win" || current_os == "winuwp") { |
|
is_nacl = false |
|
is_posix = true |
|
is_win = false |
|
+ is_haiku = false |
|
+} else if (current_os == "haiku") { |
|
+ is_aix = false |
|
+ is_android = false |
|
+ is_chromeos = false |
|
+ is_fuchsia = false |
|
+ is_ios = false |
|
+ is_linux = false |
|
+ is_mac = false |
|
+ is_nacl = false |
|
+ is_posix = true |
|
+ is_win = false |
|
+ is_haiku = true |
|
} |
|
|
|
# ============================================================================= |
|
@@ -486,6 +511,15 @@ if (!is_chromeos) { |
|
"*\bchromeos/*", |
|
] |
|
} |
|
+if (!is_haiku) { |
|
+ sources_assignment_filter += [ |
|
+ "*_haiku.h", |
|
+ "*_haiku.cc", |
|
+ "*_haiku_unittest.h", |
|
+ "*_haiku_unittest.cc", |
|
+ "*\bhaiku/*", |
|
+ ] |
|
+} |
|
|
|
# DO NOT ADD MORE PATTERNS TO THIS LIST, see set_sources_assignment_filter call |
|
# below. |
|
diff --git a/src/3rdparty/chromium/build/config/compiler/BUILD.gn b/src/3rdparty/chromium/build/config/compiler/BUILD.gn |
|
index d223a4f6f..d808ca56c 100644 |
|
--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn |
|
+++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn |
|
@@ -227,6 +227,8 @@ config("compiler") { |
|
configs += [ "//build/config/fuchsia:compiler" ] |
|
} else if (current_os == "aix") { |
|
configs += [ "//build/config/aix:compiler" ] |
|
+ } else if (is_haiku) { |
|
+ configs += [ "//build/config/haiku:compiler" ] |
|
} |
|
|
|
configs += [ |
|
@@ -260,7 +262,7 @@ config("compiler") { |
|
# The x86 toolchain currently has problems with stack-protector. |
|
if (is_android && current_cpu == "x86") { |
|
cflags += [ "-fno-stack-protector" ] |
|
- } else if (current_os != "aix") { |
|
+ } else if (current_os != "aix" && current_os != "haiku") { |
|
# Not available on aix. |
|
cflags += [ "-fstack-protector" ] |
|
} |
|
@@ -1192,6 +1194,8 @@ config("runtime_library") { |
|
configs += [ "//build/config/mac:runtime_library" ] |
|
} else if (is_android) { |
|
configs += [ "//build/config/android:runtime_library" ] |
|
+ } else if (is_haiku) { |
|
+ configs += [ "//build/config/haiku:runtime_library" ] |
|
} |
|
|
|
if (is_component_build) { |
|
diff --git a/src/3rdparty/chromium/build/config/crypto.gni b/src/3rdparty/chromium/build/config/crypto.gni |
|
index a3d52deaf..2c07d3c13 100644 |
|
--- a/src/3rdparty/chromium/build/config/crypto.gni |
|
+++ b/src/3rdparty/chromium/build/config/crypto.gni |
|
@@ -12,4 +12,4 @@ |
|
# to set up feature flags. |
|
|
|
# True if NSS is used for certificate handling. |
|
-use_nss_certs = is_linux |
|
+use_nss_certs = is_linux || is_haiku |
|
diff --git a/src/3rdparty/chromium/build/config/haiku/BUILD.gn b/src/3rdparty/chromium/build/config/haiku/BUILD.gn |
|
new file mode 100644 |
|
index 000000000..6f5e059cb |
|
--- /dev/null |
|
+++ b/src/3rdparty/chromium/build/config/haiku/BUILD.gn |
|
@@ -0,0 +1,19 @@ |
|
+# Copyright (c) 2013 The Chromium Authors. All rights reserved. |
|
+# Use of this source code is governed by a BSD-style license that can be |
|
+# found in the LICENSE file. |
|
+ |
|
+import("//build/config/ui.gni") |
|
+ |
|
+# This is included by reference in the //build/config/compiler config that |
|
+# is applied to all targets. It is here to separate out the logic that is |
|
+# Linux-only. This is not applied to Android, but is applied to ChromeOS. |
|
+config("compiler") { |
|
+} |
|
+ |
|
+# This is included by reference in the //build/config/compiler:runtime_library |
|
+# config that is applied to all targets. It is here to separate out the logic |
|
+# that is Linux-only. Please see that target for advice on what should go in |
|
+# :runtime_library vs. :compiler. |
|
+config("runtime_library") { |
|
+ libs = [ "be" ] |
|
+} |
|
diff --git a/src/3rdparty/chromium/build/config/linux/pkg-config.py b/src/3rdparty/chromium/build/config/linux/pkg-config.py |
|
index 3327152bf..57c4dcf28 100755 |
|
--- a/src/3rdparty/chromium/build/config/linux/pkg-config.py |
|
+++ b/src/3rdparty/chromium/build/config/linux/pkg-config.py |
|
@@ -107,7 +107,7 @@ def main(): |
|
# If this is run on non-Linux platforms, just return nothing and indicate |
|
# success. This allows us to "kind of emulate" a Linux build from other |
|
# platforms. |
|
- if "linux" not in sys.platform: |
|
+ if "linux" not in sys.platform and "haiku" not in sys.platform: |
|
print "[[],[],[],[],[]]" |
|
return 0 |
|
|
|
diff --git a/src/3rdparty/chromium/build/secondary/third_party/libjpeg_turbo/BUILD.gn b/src/3rdparty/chromium/build/secondary/third_party/libjpeg_turbo/BUILD.gn |
|
index 265d30b07..cc331cde3 100644 |
|
--- a/src/3rdparty/chromium/build/secondary/third_party/libjpeg_turbo/BUILD.gn |
|
+++ b/src/3rdparty/chromium/build/secondary/third_party/libjpeg_turbo/BUILD.gn |
|
@@ -93,7 +93,7 @@ if (current_cpu == "x86" || current_cpu == "x64") { |
|
} |
|
} else if (is_mac || is_ios) { |
|
defines += [ "MACHO" ] |
|
- } else if (is_linux || is_android || is_fuchsia) { |
|
+ } else if (is_linux || is_android || is_fuchsia || is_haiku) { |
|
defines += [ "ELF" ] |
|
} |
|
} |
|
diff --git a/src/3rdparty/chromium/build/secondary/third_party/nss/BUILD.gn b/src/3rdparty/chromium/build/secondary/third_party/nss/BUILD.gn |
|
index 5788f3e5d..3f6c39e2b 100644 |
|
--- a/src/3rdparty/chromium/build/secondary/third_party/nss/BUILD.gn |
|
+++ b/src/3rdparty/chromium/build/secondary/third_party/nss/BUILD.gn |
|
@@ -4,7 +4,7 @@ |
|
|
|
import("//build/config/linux/pkg_config.gni") |
|
|
|
-if (is_linux) { |
|
+if (is_linux || is_haiku) { |
|
# This is a dependency on NSS with no libssl. On Linux we use a built-in SSL |
|
# library but the system NSS libraries. Non-Linux platforms using NSS use the |
|
# hermetic one in //third_party/nss. |
|
diff --git a/src/3rdparty/chromium/build/toolchain/haiku/BUILD.gn b/src/3rdparty/chromium/build/toolchain/haiku/BUILD.gn |
|
new file mode 100644 |
|
index 000000000..6ab1fb5f4 |
|
--- /dev/null |
|
+++ b/src/3rdparty/chromium/build/toolchain/haiku/BUILD.gn |
|
@@ -0,0 +1,44 @@ |
|
+# Copyright 2013 The Chromium Authors. All rights reserved. |
|
+# Use of this source code is governed by a BSD-style license that can be |
|
+# found in the LICENSE file. |
|
+ |
|
+import("//build/config/sysroot.gni") |
|
+import("//build/toolchain/gcc_toolchain.gni") |
|
+ |
|
+gcc_toolchain("x86") { |
|
+ cc = "gcc" |
|
+ cxx = "g++" |
|
+ |
|
+ readelf = "readelf" |
|
+ nm = "nm" |
|
+ ar = "ar" |
|
+ ld = cxx |
|
+ |
|
+ # Output linker map files for binary size analysis. |
|
+ #enable_linker_map = true |
|
+ |
|
+ toolchain_args = { |
|
+ current_cpu = "x86" |
|
+ current_os = "haiku" |
|
+ is_clang = false |
|
+ } |
|
+} |
|
+ |
|
+gcc_toolchain("x64") { |
|
+ cc = "gcc" |
|
+ cxx = "g++" |
|
+ |
|
+ readelf = "readelf" |
|
+ nm = "nm" |
|
+ ar = "ar" |
|
+ ld = cxx |
|
+ |
|
+ # Output linker map files for binary size analysis. |
|
+ #enable_linker_map = true |
|
+ |
|
+ toolchain_args = { |
|
+ current_cpu = "x64" |
|
+ current_os = "haiku" |
|
+ is_clang = false |
|
+ } |
|
+} |
|
diff --git a/src/3rdparty/chromium/chrome/browser/BUILD.gn b/src/3rdparty/chromium/chrome/browser/BUILD.gn |
|
index 788595bc5..07dc2385d 100644 |
|
--- a/src/3rdparty/chromium/chrome/browser/BUILD.gn |
|
+++ b/src/3rdparty/chromium/chrome/browser/BUILD.gn |
|
@@ -3300,7 +3300,7 @@ jumbo_split_static_library("browser") { |
|
] |
|
} |
|
|
|
- if (is_posix && !is_mac) { |
|
+ if (is_posix && !is_mac && !is_haiku) { |
|
# TODO(crbug.com/753619): Enable crash reporting on Fuchsia. |
|
sources += [ |
|
"//chrome/app/chrome_crash_reporter_client.cc", |
|
diff --git a/src/3rdparty/chromium/chrome/test/BUILD.gn b/src/3rdparty/chromium/chrome/test/BUILD.gn |
|
index 487205fa9..8ccfaa65e 100644 |
|
--- a/src/3rdparty/chromium/chrome/test/BUILD.gn |
|
+++ b/src/3rdparty/chromium/chrome/test/BUILD.gn |
|
@@ -5225,7 +5225,7 @@ test("chrome_app_unittests") { |
|
"//components/crash/core/common", |
|
"//components/flags_ui:switches", |
|
] |
|
- if (!is_fuchsia) { |
|
+ if (!is_fuchsia && !is_haiku) { |
|
# TODO(crbug.com/753619): Enable crash reporting on Fuchsia. |
|
deps += [ "//third_party/breakpad:client" ] |
|
} |
|
diff --git a/src/3rdparty/chromium/components/BUILD.gn b/src/3rdparty/chromium/components/BUILD.gn |
|
index 01ceb7d1e..07a9be720 100644 |
|
--- a/src/3rdparty/chromium/components/BUILD.gn |
|
+++ b/src/3rdparty/chromium/components/BUILD.gn |
|
@@ -329,6 +329,13 @@ test("components_unittests") { |
|
deps += [ "//components/browser_watcher:unit_tests" ] |
|
} |
|
|
|
+ if (is_haiku) { |
|
+ deps -= [ |
|
+ "//components/crash/content/browser:unit_tests", |
|
+ "//components/data_reduction_proxy/content/browser:unit_tests", |
|
+ ] |
|
+ } |
|
+ |
|
if (enable_basic_printing) { |
|
deps += [ "//components/services/pdf_compositor:unit_tests" ] |
|
} |
|
diff --git a/src/3rdparty/chromium/components/crash/content/browser/BUILD.gn b/src/3rdparty/chromium/components/crash/content/browser/BUILD.gn |
|
index 68c98d4cf..00d4d6c49 100644 |
|
--- a/src/3rdparty/chromium/components/crash/content/browser/BUILD.gn |
|
+++ b/src/3rdparty/chromium/components/crash/content/browser/BUILD.gn |
|
@@ -7,7 +7,7 @@ if (is_android) { |
|
} |
|
|
|
# TODO(crbug.com/753619): Enable crash reporting on Fuchsia. |
|
-assert(!is_fuchsia) |
|
+assert(!is_fuchsia && !is_haiku) |
|
|
|
source_set("browser") { |
|
sources = [ |
|
diff --git a/src/3rdparty/chromium/components/crash/core/common/BUILD.gn b/src/3rdparty/chromium/components/crash/core/common/BUILD.gn |
|
index c8e02ebf8..bfecb9bf4 100644 |
|
--- a/src/3rdparty/chromium/components/crash/core/common/BUILD.gn |
|
+++ b/src/3rdparty/chromium/components/crash/core/common/BUILD.gn |
|
@@ -6,7 +6,7 @@ import("//build/buildflag_header.gni") |
|
|
|
declare_args() { |
|
# If set to true, this will stub out and disable the entire crash key system. |
|
- use_crash_key_stubs = is_fuchsia |
|
+ use_crash_key_stubs = is_fuchsia || is_haiku |
|
} |
|
|
|
group("common") { |
|
diff --git a/src/3rdparty/chromium/components/data_reduction_proxy/content/browser/BUILD.gn b/src/3rdparty/chromium/components/data_reduction_proxy/content/browser/BUILD.gn |
|
index 997a9fda9..70286b254 100644 |
|
--- a/src/3rdparty/chromium/components/data_reduction_proxy/content/browser/BUILD.gn |
|
+++ b/src/3rdparty/chromium/components/data_reduction_proxy/content/browser/BUILD.gn |
|
@@ -16,7 +16,6 @@ static_library("browser") { |
|
|
|
deps = [ |
|
"//base", |
|
- "//components/crash/content/browser", |
|
"//components/data_reduction_proxy/core/browser", |
|
"//components/data_reduction_proxy/core/common", |
|
"//components/data_use_measurement/core", |
|
@@ -27,6 +26,9 @@ static_library("browser") { |
|
"//net", |
|
"//services/network/public/cpp", |
|
] |
|
+ if (is_android) { |
|
+ deps += [ "//components/crash/content/browser" ] |
|
+ } |
|
} |
|
|
|
source_set("unit_tests") { |
|
@@ -41,7 +43,6 @@ source_set("unit_tests") { |
|
deps = [ |
|
":browser", |
|
"//base", |
|
- "//components/crash/content/browser", |
|
"//components/data_reduction_proxy/core/browser:test_support", |
|
"//components/data_reduction_proxy/core/common:test_support", |
|
"//content/public/browser", |
|
@@ -53,4 +54,7 @@ source_set("unit_tests") { |
|
"//testing/gmock", |
|
"//testing/gtest", |
|
] |
|
+ if (is_android) { |
|
+ deps += [ "//components/crash/content/browser" ] |
|
+ } |
|
} |
|
diff --git a/src/3rdparty/chromium/content/shell/BUILD.gn b/src/3rdparty/chromium/content/shell/BUILD.gn |
|
index d06b34303..3de9a35e0 100644 |
|
--- a/src/3rdparty/chromium/content/shell/BUILD.gn |
|
+++ b/src/3rdparty/chromium/content/shell/BUILD.gn |
|
@@ -322,6 +322,14 @@ static_library("content_shell_lib") { |
|
] |
|
deps += [ "//third_party/fuchsia-sdk:policy" ] |
|
} |
|
+ if (is_haiku) { |
|
+ sources += [ "app/blink_test_platform_support_fuchsia.cc" ] |
|
+ deps -= [ |
|
+ "//components/crash/content/app", |
|
+ "//components/crash/content/app:test_support", |
|
+ "//components/crash/content/browser", |
|
+ ] |
|
+ } |
|
|
|
# Annoyingly, this target and layouttest_support have circular includes. |
|
allow_circular_includes_from = [ "//content/test:layouttest_support" ] |
|
@@ -925,7 +933,7 @@ group("content_shell_crash_test") { |
|
if (is_win) { |
|
data_deps += [ "//build/win:copy_cdb_to_output" ] |
|
} |
|
- if (is_posix && !is_android) { |
|
+ if (is_posix && !is_android && !is_haiku) { |
|
data_deps += [ |
|
"//third_party/breakpad:dump_syms($host_toolchain)", |
|
"//third_party/breakpad:minidump_stackwalk($host_toolchain)", |
|
diff --git a/src/3rdparty/chromium/gpu/ipc/common/surface_handle.h b/src/3rdparty/chromium/gpu/ipc/common/surface_handle.h |
|
index cb6f279ce..49d20756f 100644 |
|
--- a/src/3rdparty/chromium/gpu/ipc/common/surface_handle.h |
|
+++ b/src/3rdparty/chromium/gpu/ipc/common/surface_handle.h |
|
@@ -11,7 +11,7 @@ |
|
|
|
#if (defined(OS_MACOSX) || defined(OS_WIN) || defined(USE_X11) || \ |
|
defined(USE_OZONE)) && \ |
|
- !defined(OS_NACL) |
|
+ !defined(OS_NACL) && !defined(OS_HAIKU) |
|
#include "ui/gfx/native_widget_types.h" |
|
#define GPU_SURFACE_HANDLE_IS_ACCELERATED_WINDOW |
|
#endif |
|
@@ -34,7 +34,7 @@ namespace gpu { |
|
using SurfaceHandle = gfx::AcceleratedWidget; |
|
constexpr SurfaceHandle kNullSurfaceHandle = gfx::kNullAcceleratedWidget; |
|
#elif defined(OS_MACOSX) || defined(OS_ANDROID) || defined(OS_NACL) || \ |
|
- defined(OS_FUCHSIA) |
|
+ defined(OS_FUCHSIA) || defined(OS_HAIKU) |
|
using SurfaceHandle = int32_t; |
|
constexpr SurfaceHandle kNullSurfaceHandle = 0; |
|
#else |
|
diff --git a/src/3rdparty/chromium/headless/BUILD.gn b/src/3rdparty/chromium/headless/BUILD.gn |
|
index 2ee5fa9d0..0ed72ba4d 100644 |
|
--- a/src/3rdparty/chromium/headless/BUILD.gn |
|
+++ b/src/3rdparty/chromium/headless/BUILD.gn |
|
@@ -592,7 +592,7 @@ test("headless_unittests") { |
|
"//testing/gtest", |
|
] |
|
|
|
- if (!is_fuchsia) { |
|
+ if (!is_fuchsia && !is_haiku) { |
|
deps += [ "//components/crash/content/browser" ] |
|
} |
|
|
|
@@ -744,7 +744,7 @@ test("headless_browsertests") { |
|
"//testing/gtest", |
|
] |
|
|
|
- if (!is_fuchsia) { |
|
+ if (!is_fuchsia && !is_haiku) { |
|
deps += [ |
|
"//components/crash/content/app:test_support", |
|
"//components/crash/content/browser", |
|
@@ -885,7 +885,7 @@ static_library("headless_shell_lib") { |
|
"//base", |
|
] |
|
|
|
- if (!is_fuchsia) { |
|
+ if (!is_fuchsia && !is_haiku) { |
|
deps += [ "//components/crash/content/browser" ] |
|
} |
|
|
|
diff --git a/src/3rdparty/chromium/third_party/libxml/BUILD.gn b/src/3rdparty/chromium/third_party/libxml/BUILD.gn |
|
index 494dec87d..611e6adbc 100644 |
|
--- a/src/3rdparty/chromium/third_party/libxml/BUILD.gn |
|
+++ b/src/3rdparty/chromium/third_party/libxml/BUILD.gn |
|
@@ -4,7 +4,7 @@ |
|
|
|
# Define an "os_include" variable that points at the OS-specific generated |
|
# headers. These were generated by running the configure script offline. |
|
-if (is_linux || is_android || is_nacl || is_fuchsia) { |
|
+if (is_linux || is_android || is_nacl || is_fuchsia || is_haiku) { |
|
os_include = "linux" |
|
} else if (is_mac || is_ios) { |
|
os_include = "mac" |
|
diff --git a/src/core/config/haiku.pri b/src/core/config/haiku.pri |
|
new file mode 100644 |
|
index 000000000..35ce06555 |
|
--- /dev/null |
|
+++ b/src/core/config/haiku.pri |
|
@@ -0,0 +1,71 @@ |
|
+include(common.pri) |
|
+include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri) |
|
+QT_FOR_CONFIG += gui-private webengine-private |
|
+ |
|
+gn_args += \ |
|
+ use_cups=false \ |
|
+ use_gio=false \ |
|
+ use_gnome_keyring=false \ |
|
+ use_alsa=false \ |
|
+ use_pulseaudio=false \ |
|
+ use_kerberos=false \ |
|
+ use_sysroot=false \ |
|
+ enable_session_service=false \ |
|
+ toolkit_views=false \ |
|
+ linux_use_bundled_binutils=false \ |
|
+ enable_pdf=false \ |
|
+ enable_basic_printing=false \ |
|
+ enable_print_preview=false \ |
|
+ enable_extensions=false \ |
|
+ enable_webrtc=false \ |
|
+ enable_plugins=false \ |
|
+ use_system_zlib=true \ |
|
+ use_system_minizip=true \ |
|
+ use_system_libpng=true \ |
|
+ use_system_freetype=true \ |
|
+ use_system_harfbuzz=true \ |
|
+ use_system_icu=true \ |
|
+ use_system_ffmpeg=true \ |
|
+ icu_use_data_file=false \ |
|
+ use_system_lcms2=true \ |
|
+ use_system_libxml=true \ |
|
+ use_system_libxslt=true \ |
|
+ pdfium_use_system_zlib=true \ |
|
+ pdfium_use_system_libpng=true \ |
|
+ is_debug=true |
|
+ |
|
+# use_ozone=true \ |
|
+# ozone_auto_platforms=false \ |
|
+# ozone_platform_headless=true \ |
|
+# ozone_platform_external=true \ |
|
+# ozone_platform=\"qt\" |
|
+ |
|
+gcc:!clang: greaterThan(QT_GCC_MAJOR_VERSION, 5): gn_args += no_delete_null_pointer_checks=true |
|
+ |
|
+qtConfig(webengine-system-libevent): gn_args += use_system_libevent=true |
|
+qtConfig(webengine-system-libwebp): gn_args += use_system_libwebp=true |
|
+qtConfig(webengine-system-libxml2): gn_args += use_system_libxml=true use_system_libxslt=true |
|
+qtConfig(webengine-system-opus): gn_args += use_system_opus=true |
|
+qtConfig(webengine-system-snappy): gn_args += use_system_snappy=true |
|
+qtConfig(webengine-system-libvpx): gn_args += use_system_libvpx=true |
|
+qtConfig(webengine-system-icu): gn_args += use_system_icu=true icu_use_data_file=false |
|
+qtConfig(webengine-system-ffmpeg): gn_args += use_system_ffmpeg=true |
|
+qtConfig(webengine-system-re2): gn_args += use_system_re2=true |
|
+qtConfig(webengine-system-lcms2): gn_args += use_system_lcms2=true |
|
+qtConfig(webengine-system-png): gn_args += use_system_libpng=true |
|
+qtConfig(webengine-system-jpeg): gn_args += use_system_libjpeg=true |
|
+qtConfig(webengine-system-freetype): gn_args += use_system_freetype=true |
|
+qtConfig(webengine-system-harfbuzz): gn_args += use_system_harfbuzz=true |
|
+!qtConfig(webengine-system-glib): gn_args += use_glib=false |
|
+# FIXME |
|
+#qtConfig(webengine-system-protobuf): gn_args += use_system_protobuf=true |
|
+#qtConfig(webengine-system-jsoncpp): gn_args += use_system_jsoncpp=true |
|
+#qtConfig(webengine-system-libsrtp: gn_args += use_system_libsrtp=true |
|
+qtConfig(webengine-system-zlib) { |
|
+ qtConfig(webengine-system-minizip): gn_args += use_system_zlib=true use_system_minizip=true |
|
+ qtConfig(webengine-printing-and-pdf): gn_args += pdfium_use_system_zlib=true |
|
+} |
|
+qtConfig(webengine-system-png) { |
|
+ gn_args += use_system_libpng=true |
|
+ qtConfig(webengine-printing-and-pdf): gn_args += pdfium_use_system_libpng=true |
|
+} |
|
diff --git a/src/core/configure.json b/src/core/configure.json |
|
index 044d85527..072766176 100644 |
|
--- a/src/core/configure.json |
|
+++ b/src/core/configure.json |
|
@@ -604,7 +604,6 @@ |
|
}, |
|
"webengine-system-gn": { |
|
"label": "Use System Gn", |
|
- "autoDetect": false, |
|
"condition": "tests.webengine-gn", |
|
"output": [ "privateFeature" ] |
|
}, |
|
diff --git a/src/core/core_module.pro b/src/core/core_module.pro |
|
index 3b5d37f29..43db1fba9 100644 |
|
--- a/src/core/core_module.pro |
|
+++ b/src/core/core_module.pro |
|
@@ -30,9 +30,11 @@ for(object, NINJA_OBJECTS): RSP_CONTENT += $$object |
|
write_file($$RSP_FILE, RSP_CONTENT) |
|
macos:LIBS_PRIVATE += -Wl,-filelist,$$shell_quote($$RSP_FILE) |
|
linux:LIBS_PRIVATE += @$$RSP_FILE |
|
+haiku:LIBS_PRIVATE += @$$RSP_FILE |
|
# QTBUG-58710 add main rsp file on windows |
|
win32:QMAKE_LFLAGS += @$$RSP_FILE |
|
linux: LIBS_PRIVATE += -Wl,--start-group $$NINJA_ARCHIVES -Wl,--end-group |
|
+haiku: LIBS_PRIVATE += -Wl,--start-group $$NINJA_ARCHIVES -Wl,--end-group |
|
else: LIBS_PRIVATE += $$NINJA_ARCHIVES |
|
LIBS_PRIVATE += $$NINJA_LIB_DIRS $$NINJA_LIBS |
|
# GN's LFLAGS doesn't always work across all the Linux configurations we support. |
|
-- |
|
2.21.0 |
|
|
