--- electron/shell/app/node_main.cc.orig 2023-01-10 12:17:28 UTC +++ electron/shell/app/node_main.cc @@ -42,7 +42,7 @@ #include "content/public/common/content_descriptors.h" #endif -#if !defined(MAS_BUILD) +#if !defined(MAS_BUILD) && !BUILDFLAG(IS_BSD) #include "components/crash/core/app/crashpad.h" // nogncheck #include "shell/app/electron_crash_reporter_client.h" #include "shell/common/crash_keys.h" @@ -94,7 +94,7 @@ int SetNodeCliFlags() { node::kDisallowedInEnvironment); } -#if defined(MAS_BUILD) +#if defined(MAS_BUILD) || BUILDFLAG(IS_BSD) void SetCrashKeyStub(const std::string& key, const std::string& value) {} void ClearCrashKeyStub(const std::string& key) {} #endif @@ -105,7 +105,7 @@ v8::Local GetParameters(v8::Isolate* isolat v8::Local GetParameters(v8::Isolate* isolate) { std::map keys; -#if !defined(MAS_BUILD) +#if !defined(MAS_BUILD) && !BUILDFLAG(IS_BSD) electron::crash_keys::GetCrashKeys(&keys); #endif return gin::ConvertToV8(isolate, keys); @@ -118,7 +118,7 @@ int NodeMain(int argc, char* argv[]) { v8_crashpad_support::SetUp(); #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) auto os_env = base::Environment::Create(); std::string fd_string, pid_string; if (os_env->GetVar("CRASHDUMP_SIGNAL_FD", &fd_string) && @@ -161,7 +161,7 @@ int NodeMain(int argc, char* argv[]) { if (result.early_return) exit(result.exit_code); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) // On Linux, initialize crashpad after Nodejs init phase so that // crash and termination signal handlers can be set by the crashpad client. if (!pid_string.empty()) { @@ -225,7 +225,7 @@ int NodeMain(int argc, char* argv[]) { // Setup process.crashReporter in child node processes gin_helper::Dictionary reporter = gin::Dictionary::CreateEmpty(isolate); reporter.SetMethod("getParameters", &GetParameters); -#if defined(MAS_BUILD) +#if defined(MAS_BUILD) || BUILDFLAG(IS_BSD) reporter.SetMethod("addExtraParameter", &SetCrashKeyStub); reporter.SetMethod("removeExtraParameter", &ClearCrashKeyStub); #else