Update Crashpad to b71bde32e7f9f5c9efaae0f6d41db738b55bda11

498c36b82a03 mac arm64: Provide something more useful from
             SystemSnapshot::CPURevison
e3c94b87f0ef [fuchsia] Move //zircon/system/ulib/fdio to //sdk/lib/fdio
fd001f792eb7 build: Make crashpad_dependencies="external" work in the GN
             build
ef8a063055c6 Fuchsia: Propagate failure to initialize exception snapshot
06a688ddc1bc linux: setup a signal stack
9f66d569fb87 linux: put test attachment in temp directory
070b18d326b6 linux: fix alt-stack tests with asan
b71bde32e7f9 linux: fix tests with msan

Change-Id: I509b8ba9053a71709f8ae24a81dc24d8da4e8fcf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2309758
Commit-Queue: Mark Mentovai <mark@chromium.org>
Auto-Submit: Joshua Peraza <jperaza@chromium.org>
Reviewed-by: Mark Mentovai <mark@chromium.org>
Cr-Commit-Position: refs/heads/master@{#790529}

third_party/crashpad/README.chromium

@@ -2,7 +2,7 @@ Name: Crashpad
 Short Name: crashpad
 URL: https://crashpad.chromium.org/
 Version: unknown
-Revision: 030c58c2959aa839d247e117ac7b28a71e7dd98c
+Revision: b71bde32e7f9f5c9efaae0f6d41db738b55bda11
 License: Apache 2.0
 License File: crashpad/LICENSE
 Security Critical: yes

third_party/crashpad/crashpad/BUILD.gn

@@ -175,7 +175,7 @@ if (crashpad_is_in_chromium || crashpad_is_in_fuchsia) {
       ]
     }
   }
-} else if (crashpad_is_standalone) {
+} else if (crashpad_is_standalone || crashpad_is_external) {
   test("crashpad_client_test") {
     deps = [
       "client:client_test",

third_party/crashpad/crashpad/build/BUILDCONFIG.gn

@@ -33,12 +33,18 @@ if (current_cpu == "") {
   current_cpu = target_cpu
 }
 
+import("//build/crashpad_buildconfig.gni")
+
+if (crashpad_is_standalone) {
+  _mini_chromium_dir = "//third_party/mini_chromium/mini_chromium"
+} else if (crashpad_is_external) {
+  _mini_chromium_dir = "//../../mini_chromium/mini_chromium"
+}
+
 if (current_os == "win") {
-  set_default_toolchain(
-      "//third_party/mini_chromium/mini_chromium/build:msvc_toolchain_$current_cpu")
+  set_default_toolchain("$_mini_chromium_dir/build:msvc_toolchain_$current_cpu")
 } else {
-  set_default_toolchain(
-      "//third_party/mini_chromium/mini_chromium/build:gcc_like_toolchain")
+  set_default_toolchain("$_mini_chromium_dir/build:gcc_like_toolchain")
 }
 
 declare_args() {
@@ -53,20 +59,19 @@ declare_args() {
 }
 
 _default_configs = [
-  "//third_party/mini_chromium/mini_chromium/build:default",
-  "//third_party/mini_chromium/mini_chromium/build:Wexit_time_destructors",
-  "//third_party/mini_chromium/mini_chromium/build:Wimplicit_fallthrough",
+  "$_mini_chromium_dir/build:default",
+  "$_mini_chromium_dir/build:Wexit_time_destructors",
+  "$_mini_chromium_dir/build:Wimplicit_fallthrough",
 ]
 
 if (crashpad_use_libfuzzer) {
   _default_configs += [ "//build:crashpad_fuzzer_flags" ]
 }
 
-_default_executable_configs =
-    _default_configs + [
-      "//third_party/mini_chromium/mini_chromium/build:executable",
-      "//third_party/mini_chromium/mini_chromium/build:win_console",
-    ]
+_default_executable_configs = _default_configs + [
+                                "$_mini_chromium_dir/build:executable",
+                                "$_mini_chromium_dir/build:win_console",
+                              ]
 
 set_defaults("source_set") {
   configs = _default_configs

third_party/crashpad/crashpad/client/BUILD.gn

@@ -115,7 +115,7 @@ static_library("client") {
   if (crashpad_is_fuchsia) {
     deps += [ "../third_party/fuchsia" ]
     if (crashpad_is_in_fuchsia) {
-      deps += [ "//zircon/public/lib/fdio" ]
+      deps += [ "//sdk/lib/fdio" ]
     }
   }
 }
@@ -175,3 +175,11 @@ source_set("client_test") {
     data_deps += [ "../handler:crashpad_handler_console" ]
   }
 }
+
+if (crashpad_is_linux || crashpad_is_android) {
+  source_set("pthread_create") {
+    sources = [ "pthread_create_linux.cc" ]
+
+    deps = [ ":client" ]
+  }
+}

third_party/crashpad/crashpad/client/crashpad_client.h

@@ -143,6 +143,29 @@ class CrashpadClient {
   //!     handler as this process' ptracer. -1 indicates that the handler's
   //!     process ID should be determined by communicating over the socket.
   bool SetHandlerSocket(ScopedFileHandle sock, pid_t pid);
+
+  //! \brief Uses `sigaltstack()` to allocate a signal stack for the calling
+  //!     thread.
+  //!
+  //! This method allocates an alternate stack to handle signals delivered to
+  //! the calling thread and should be called early in the lifetime of each
+  //! thread. Installing an alternate stack allows signals to be delivered in
+  //! the event that the call stack's stack pointer points to invalid memory,
+  //! as in the case of stack overflow.
+  //!
+  //! This method is called automatically by SetHandlerSocket() and
+  //! the various StartHandler() methods. It is harmless to call multiple times.
+  //! A new signal stack will be allocated only if there is no existing stack or
+  //! the existing stack is too small. The stack will be automatically freed
+  //! when the thread exits.
+  //!
+  //! An application might choose to diligently call this method from the start
+  //! routine for each thread, call it from a `pthread_create()` wrapper which
+  //! the application provides, or link the provided "client:pthread_create"
+  //! target.
+  //!
+  //! \return `true` on success. Otherwise `false` with a message logged.
+  static bool InitializeSignalStackForThread();
 #endif  // OS_ANDROID || OS_LINUX || DOXYGEN
 
 #if defined(OS_ANDROID) || DOXYGEN

third_party/crashpad/crashpad/client/crashpad_client_linux.cc

@@ -14,8 +14,11 @@
 
 #include "client/crashpad_client.h"
 
+#include <errno.h>
 #include <fcntl.h>
+#include <pthread.h>
 #include <stdlib.h>
+#include <sys/mman.h>
 #include <sys/prctl.h>
 #include <sys/socket.h>
 #include <sys/syscall.h>
@@ -34,8 +37,10 @@
 #include "util/linux/scoped_pr_set_dumpable.h"
 #include "util/linux/scoped_pr_set_ptracer.h"
 #include "util/linux/socket.h"
+#include "util/misc/address_sanitizer.h"
 #include "util/misc/from_pointer_cast.h"
 #include "util/posix/double_fork_and_exec.h"
+#include "util/posix/scoped_mmap.h"
 #include "util/posix/signals.h"
 
 namespace crashpad {
@@ -167,10 +172,14 @@ class SignalHandler {
   ~SignalHandler() = default;
 
   bool Install(const std::set<int>* unhandled_signals) {
+    bool signal_stack_initialized =
+        CrashpadClient::InitializeSignalStackForThread();
+    DCHECK(signal_stack_initialized);
+
     DCHECK(!handler_);
     handler_ = this;
     return Signals::InstallCrashHandlers(
-        HandleOrReraiseSignal, 0, &old_actions_, unhandled_signals);
+        HandleOrReraiseSignal, SA_ONSTACK, &old_actions_, unhandled_signals);
   }
 
   const ExceptionInformation& GetExceptionInfo() {
@@ -413,6 +422,99 @@ bool CrashpadClient::SetHandlerSocket(ScopedFileHandle sock, pid_t pid) {
   auto signal_handler = RequestCrashDumpHandler::Get();
   return signal_handler->Initialize(std::move(sock), pid, &unhandled_signals_);
 }
+
+// static
+bool CrashpadClient::InitializeSignalStackForThread() {
+  stack_t stack;
+  if (sigaltstack(nullptr, &stack) != 0) {
+    PLOG(ERROR) << "sigaltstack";
+    return false;
+  }
+
+  DCHECK_EQ(stack.ss_flags & SS_ONSTACK, 0);
+
+  const size_t page_size = getpagesize();
+#if defined(ADDRESS_SANITIZER)
+  const size_t kStackSize = 2 * ((SIGSTKSZ + page_size - 1) & ~(page_size - 1));
+#else
+  const size_t kStackSize = (SIGSTKSZ + page_size - 1) & ~(page_size - 1);
+#endif  // ADDRESS_SANITIZER
+  if (stack.ss_flags & SS_DISABLE || stack.ss_size < kStackSize) {
+    const size_t kGuardPageSize = page_size;
+    const size_t kStackAllocSize = kStackSize + 2 * kGuardPageSize;
+
+    static void (*stack_destructor)(void*) = [](void* stack_mem) {
+      const size_t page_size = getpagesize();
+      const size_t kGuardPageSize = page_size;
+#if defined(ADDRESS_SANITIZER)
+      const size_t kStackSize =
+          2 * ((SIGSTKSZ + page_size - 1) & ~(page_size - 1));
+#else
+      const size_t kStackSize = (SIGSTKSZ + page_size - 1) & ~(page_size - 1);
+#endif  // ADDRESS_SANITIZER
+      const size_t kStackAllocSize = kStackSize + 2 * kGuardPageSize;
+
+      stack_t stack;
+      stack.ss_flags = SS_DISABLE;
+      if (sigaltstack(&stack, &stack) != 0) {
+        PLOG(ERROR) << "sigaltstack";
+      } else if (stack.ss_sp !=
+                 static_cast<char*>(stack_mem) + kGuardPageSize) {
+        PLOG_IF(ERROR, sigaltstack(&stack, nullptr) != 0) << "sigaltstack";
+      }
+
+      if (munmap(stack_mem, kStackAllocSize) != 0) {
+        PLOG(ERROR) << "munmap";
+      }
+    };
+
+    static pthread_key_t stack_key;
+    static int key_error = []() {
+      errno = pthread_key_create(&stack_key, stack_destructor);
+      PLOG_IF(ERROR, errno) << "pthread_key_create";
+      return errno;
+    }();
+    if (key_error) {
+      return false;
+    }
+
+    auto old_stack = static_cast<char*>(pthread_getspecific(stack_key));
+    if (old_stack) {
+      stack.ss_sp = old_stack + kGuardPageSize;
+    } else {
+      ScopedMmap stack_mem;
+      if (!stack_mem.ResetMmap(nullptr,
+                               kStackAllocSize,
+                               PROT_NONE,
+                               MAP_PRIVATE | MAP_ANONYMOUS,
+                               -1,
+                               0)) {
+        return false;
+      }
+
+      if (mprotect(stack_mem.addr_as<char*>() + kGuardPageSize,
+                   kStackSize,
+                   PROT_READ | PROT_WRITE) != 0) {
+        PLOG(ERROR) << "mprotect";
+        return false;
+      }
+
+      stack.ss_sp = stack_mem.addr_as<char*>() + kGuardPageSize;
+
+      errno = pthread_setspecific(stack_key, stack_mem.release());
+      PCHECK(errno == 0) << "pthread_setspecific";
+    }
+
+    stack.ss_size = kStackSize;
+    stack.ss_flags =
+        (stack.ss_flags & SS_DISABLE) ? 0 : stack.ss_flags & SS_AUTODISARM;
+    if (sigaltstack(&stack, nullptr) != 0) {
+      PLOG(ERROR) << "sigaltstack";
+      return false;
+    }
+  }
+  return true;
+}
 #endif  // OS_ANDROID || OS_LINUX
 
 #if defined(OS_ANDROID)

third_party/crashpad/crashpad/client/crashpad_client_linux_test.cc

@@ -15,6 +15,7 @@
 #include "client/crashpad_client.h"
 
 #include <dlfcn.h>
+#include <signal.h>
 #include <stdlib.h>
 #include <sys/syscall.h>
 #include <sys/types.h>
@@ -30,6 +31,7 @@
 #include "snapshot/annotation_snapshot.h"
 #include "snapshot/minidump/process_snapshot_minidump.h"
 #include "snapshot/sanitized/sanitization_information.h"
+#include "test/errors.h"
 #include "test/multiprocess.h"
 #include "test/multiprocess_exec.h"
 #include "test/scoped_temp_dir.h"
@@ -39,9 +41,13 @@
 #include "util/linux/exception_handler_client.h"
 #include "util/linux/exception_information.h"
 #include "util/linux/socket.h"
+#include "util/misc/address_sanitizer.h"
 #include "util/misc/address_types.h"
 #include "util/misc/from_pointer_cast.h"
+#include "util/misc/memory_sanitizer.h"
+#include "util/posix/scoped_mmap.h"
 #include "util/posix/signals.h"
+#include "util/thread/thread.h"
 
 #if defined(OS_ANDROID)
 #include <android/set_abort_message.h>
@@ -56,22 +62,33 @@ namespace crashpad {
 namespace test {
 namespace {
 
+enum class CrashType : uint32_t {
+  kSimulated,
+  kBuiltinTrap,
+  kInfiniteRecursion,
+};
+
 struct StartHandlerForSelfTestOptions {
   bool start_handler_at_crash;
-  bool simulate_crash;
   bool set_first_chance_handler;
+  bool crash_non_main_thread;
+  bool client_uses_signals;
+  CrashType crash_type;
 };
 
 class StartHandlerForSelfTest
-    : public testing::TestWithParam<std::tuple<bool, bool, bool>> {
+    : public testing::TestWithParam<
+          std::tuple<bool, bool, bool, bool, CrashType>> {
  public:
   StartHandlerForSelfTest() = default;
   ~StartHandlerForSelfTest() = default;
 
   void SetUp() override {
     std::tie(options_.start_handler_at_crash,
-             options_.simulate_crash,
-             options_.set_first_chance_handler) = GetParam();
+             options_.set_first_chance_handler,
+             options_.crash_non_main_thread,
+             options_.client_uses_signals,
+             options_.crash_type) = GetParam();
   }
 
   const StartHandlerForSelfTestOptions& Options() const { return options_; }
@@ -164,6 +181,100 @@ void ValidateDump(const CrashReportDatabase::UploadReport* report) {
   ADD_FAILURE();
 }
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Winfinite-recursion"
+int RecurseInfinitely(int* ptr) {
+  int buf[1 << 20];
+  return *ptr + RecurseInfinitely(buf);
+}
+#pragma clang diagnostic pop
+
+void DoCrash(const StartHandlerForSelfTestOptions& options,
+             CrashpadClient* client) {
+  switch (options.crash_type) {
+    case CrashType::kSimulated:
+      if (options.set_first_chance_handler) {
+        client->SetFirstChanceExceptionHandler(HandleCrashSuccessfully);
+      }
+      CRASHPAD_SIMULATE_CRASH();
+      break;
+
+    case CrashType::kBuiltinTrap:
+      __builtin_trap();
+      break;
+
+    case CrashType::kInfiniteRecursion:
+      int val = 42;
+      exit(RecurseInfinitely(&val));
+      break;
+  }
+}
+
+class ScopedAltSignalStack {
+ public:
+  ScopedAltSignalStack() = default;
+
+  ~ScopedAltSignalStack() {
+    if (stack_mem_.is_valid()) {
+      stack_t stack;
+      stack.ss_flags = SS_DISABLE;
+      if (sigaltstack(&stack, nullptr) != 0) {
+        ADD_FAILURE() << ErrnoMessage("sigaltstack");
+      }
+    }
+  }
+
+  void Initialize() {
+    ScopedMmap local_stack_mem;
+    constexpr size_t stack_size = MINSIGSTKSZ;
+    ASSERT_TRUE(local_stack_mem.ResetMmap(nullptr,
+                                          stack_size,
+                                          PROT_READ | PROT_WRITE,
+                                          MAP_PRIVATE | MAP_ANONYMOUS,
+                                          -1,
+                                          0));
+
+    stack_t stack;
+    stack.ss_sp = local_stack_mem.addr();
+    stack.ss_size = stack_size;
+    stack.ss_flags = 0;
+    ASSERT_EQ(sigaltstack(&stack, nullptr), 0) << ErrnoMessage("sigaltstack");
+    stack_mem_.ResetAddrLen(local_stack_mem.release(), stack_size);
+  }
+
+ private:
+  ScopedMmap stack_mem_;
+
+  DISALLOW_COPY_AND_ASSIGN(ScopedAltSignalStack);
+};
+
+class CrashThread : public Thread {
+ public:
+  CrashThread(const StartHandlerForSelfTestOptions& options,
+              CrashpadClient* client)
+      : client_signal_stack_(), options_(options), client_(client) {}
+
+ private:
+  void ThreadMain() override {
+    // It is only necessary to call InitializeSignalStackForThread() once, but
+    // should be harmless to call multiple times and durable against the client
+    // using sigaltstack() either before or after it is called.
+    CrashpadClient::InitializeSignalStackForThread();
+    if (options_.client_uses_signals) {
+      client_signal_stack_.Initialize();
+    }
+    CrashpadClient::InitializeSignalStackForThread();
+
+    DoCrash(options_, client_);
+  }
+
+  ScopedAltSignalStack client_signal_stack_;
+  const StartHandlerForSelfTestOptions& options_;
+  CrashpadClient* client_;
+
+  DISALLOW_COPY_AND_ASSIGN(CrashThread);
+};
+
 CRASHPAD_CHILD_TEST_MAIN(StartHandlerForSelfTestChild) {
   FileHandle in = StdioFileHandle(StdioStream::kStandardInput);
 
@@ -176,6 +287,25 @@ CRASHPAD_CHILD_TEST_MAIN(StartHandlerForSelfTestChild) {
   StartHandlerForSelfTestOptions options;
   CheckedReadFileExactly(in, &options, sizeof(options));
 
+  ScopedAltSignalStack client_signal_stack;
+  if (options.client_uses_signals) {
+    client_signal_stack.Initialize();
+
+    static Signals::OldActions old_actions;
+    static Signals::Handler client_handler =
+        [](int signo, siginfo_t* siginfo, void*) {
+          FileHandle out = StdioFileHandle(StdioStream::kStandardOutput);
+          char c = 0;
+          WriteFile(out, &c, sizeof(c));
+
+          Signals::RestoreHandlerAndReraiseSignalOnReturn(
+              siginfo, old_actions.ActionForSignal(signo));
+        };
+
+    CHECK(Signals::InstallCrashHandlers(
+        client_handler, SA_ONSTACK, &old_actions));
+  }
+
   base::FilePath handler_path = TestPaths::Executable().DirName().Append(
       FILE_PATH_LITERAL("crashpad_handler"));
 
@@ -185,7 +315,7 @@ CRASHPAD_CHILD_TEST_MAIN(StartHandlerForSelfTestChild) {
   test_annotation.Set(kTestAnnotationValue);
 
   const std::vector<base::FilePath> attachments = {
-      base::FilePath(kTestAttachmentName)};
+      base::FilePath(temp_dir).Append(kTestAttachmentName)};
 
   crashpad::CrashpadClient client;
   if (!InstallHandler(&client,
@@ -202,17 +332,14 @@ CRASHPAD_CHILD_TEST_MAIN(StartHandlerForSelfTestChild) {
   }
 #endif
 
-  if (options.simulate_crash) {
-    if (options.set_first_chance_handler) {
-      client.SetFirstChanceExceptionHandler(HandleCrashSuccessfully);
-    }
-    CRASHPAD_SIMULATE_CRASH();
-    return EXIT_SUCCESS;
+  if (options.crash_non_main_thread) {
+    CrashThread thread(options, &client);
+    thread.Start();
+    thread.Join();
+  } else {
+    DoCrash(options, &client);
   }
 
-  __builtin_trap();
-
-  NOTREACHED();
   return EXIT_SUCCESS;
 }
 
@@ -221,23 +348,22 @@ class StartHandlerForSelfInChildTest : public MultiprocessExec {
   StartHandlerForSelfInChildTest(const StartHandlerForSelfTestOptions& options)
       : MultiprocessExec(), options_(options) {
     SetChildTestMainFunction("StartHandlerForSelfTestChild");
-    if (!options.simulate_crash) {
-      SetExpectedChildTerminationBuiltinTrap();
+    switch (options.crash_type) {
+      case CrashType::kSimulated:
+        // kTerminationNormal, EXIT_SUCCESS
+        break;
+      case CrashType::kBuiltinTrap:
+        SetExpectedChildTerminationBuiltinTrap();
+        break;
+      case CrashType::kInfiniteRecursion:
+        SetExpectedChildTermination(TerminationReason::kTerminationSignal,
+                                    SIGSEGV);
+        break;
     }
   }
 
  private:
   void MultiprocessParent() override {
-    FileWriter writer;
-    base::FilePath test_attachment_path = base::FilePath(kTestAttachmentName);
-    bool is_created = writer.Open(test_attachment_path,
-                                  FileWriteMode::kCreateOrFail,
-                                  FilePermissions::kOwnerOnly);
-    ASSERT_TRUE(is_created);
-    ScopedRemoveFile attachment_remover(test_attachment_path);
-    writer.Write(kTestAttachmentContent, sizeof(kTestAttachmentContent));
-    writer.Close();
-
     ScopedTempDir temp_dir;
     VMSize temp_dir_length = temp_dir.path().value().size();
     ASSERT_TRUE(LoggingWriteFile(
@@ -247,6 +373,23 @@ class StartHandlerForSelfInChildTest : public MultiprocessExec {
     ASSERT_TRUE(
         LoggingWriteFile(WritePipeHandle(), &options_, sizeof(options_)));
 
+    FileWriter writer;
+    base::FilePath test_attachment_path =
+        temp_dir.path().Append(kTestAttachmentName);
+    bool is_created = writer.Open(test_attachment_path,
+                                  FileWriteMode::kCreateOrFail,
+                                  FilePermissions::kOwnerOnly);
+    ASSERT_TRUE(is_created);
+    writer.Write(kTestAttachmentContent, sizeof(kTestAttachmentContent));
+    writer.Close();
+
+    if (options_.client_uses_signals && !options_.set_first_chance_handler &&
+        options_.crash_type != CrashType::kSimulated) {
+      // Wait for child's client signal handler.
+      char c;
+      EXPECT_TRUE(LoggingReadFileExactly(ReadPipeHandle(), &c, sizeof(c)));
+    }
+
     // Wait for child to finish.
     CheckedReadFileAtEOF(ReadPipeHandle());
 
@@ -279,19 +422,30 @@ class StartHandlerForSelfInChildTest : public MultiprocessExec {
 };
 
 TEST_P(StartHandlerForSelfTest, StartHandlerInChild) {
-  if (Options().set_first_chance_handler && !Options().simulate_crash) {
+  if (Options().set_first_chance_handler &&
+      Options().crash_type != CrashType::kSimulated) {
     // TODO(jperaza): test first chance handlers with real crashes.
     return;
   }
+#if defined(ADDRESS_SANITIZER) || defined(MEMORY_SANITIZER)
+  if (Options().crash_type == CrashType::kInfiniteRecursion) {
+    GTEST_SKIP();
+  }
+#endif  // defined(ADDRESS_SANITIZER)
   StartHandlerForSelfInChildTest test(Options());
   test.Run();
 }
 
-INSTANTIATE_TEST_SUITE_P(StartHandlerForSelfTestSuite,
-                         StartHandlerForSelfTest,
-                         testing::Combine(testing::Bool(),
-                                          testing::Bool(),
-                                          testing::Bool()));
+INSTANTIATE_TEST_SUITE_P(
+    StartHandlerForSelfTestSuite,
+    StartHandlerForSelfTest,
+    testing::Combine(testing::Bool(),
+                     testing::Bool(),
+                     testing::Bool(),
+                     testing::Bool(),
+                     testing::Values(CrashType::kSimulated,
+                                     CrashType::kBuiltinTrap,
+                                     CrashType::kInfiniteRecursion)));
 
 // Test state for starting the handler for another process.
 class StartHandlerForClientTest {

third_party/crashpad/crashpad/client/pthread_create_linux.cc

+// Copyright 2020 The Crashpad Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include <dlfcn.h>
+#include <pthread.h>
+
+#include "base/logging.h"
+#include "client/crashpad_client.h"
+
+namespace {
+
+using StartRoutineType = void* (*)(void*);
+
+struct StartParams {
+  StartRoutineType start_routine;
+  void* arg;
+};
+
+void* InitializeSignalStackAndStart(StartParams* params) {
+  crashpad::CrashpadClient::InitializeSignalStackForThread();
+
+  StartParams local_params = *params;
+  delete params;
+
+  return local_params.start_routine(local_params.arg);
+}
+
+}  // namespace
+
+extern "C" {
+
+__attribute__((visibility("default"))) int pthread_create(
+    pthread_t* thread,
+    const pthread_attr_t* attr,
+    StartRoutineType start_routine,
+    void* arg) {
+  static const auto next_pthread_create = []() {
+    const auto next_pthread_create =
+        reinterpret_cast<decltype(pthread_create)*>(
+            dlsym(RTLD_NEXT, "pthread_create"));
+    CHECK(next_pthread_create) << "dlsym: " << dlerror();
+    return next_pthread_create;
+  }();
+
+  StartParams* params = new StartParams;
+  params->start_routine = start_routine;
+  params->arg = arg;
+
+  int result = next_pthread_create(
+      thread,
+      attr,
+      reinterpret_cast<StartRoutineType>(InitializeSignalStackAndStart),
+      params);
+  if (result != 0) {
+    delete params;
+  }
+  return result;
+}
+
+}  // extern "C"

third_party/crashpad/crashpad/compat/linux/signal.h

@@ -17,6 +17,11 @@
 
 #include_next <signal.h>
 
+// Missing from glibc and bionic
+#if !defined(SS_AUTODISARM)
+#define SS_AUTODISARM (1u << 31)
+#endif
+
 // Missing from glibc and bionic-x86_64
 
 #if defined(__x86_64__) || defined(__i386__)

third_party/crashpad/crashpad/handler/BUILD.gn

@@ -156,6 +156,10 @@ if (!crashpad_is_ios) {
             [ "//third_party/mini_chromium/mini_chromium/build:win_windowed" ]
       }
     }
+
+    if (crashpad_is_linux) {
+      deps += [ "../client:pthread_create" ]
+    }
   }
 }
 

third_party/crashpad/crashpad/snapshot/fuchsia/exception_snapshot_fuchsia.cc

@@ -24,7 +24,7 @@ namespace internal {
 ExceptionSnapshotFuchsia::ExceptionSnapshotFuchsia() = default;
 ExceptionSnapshotFuchsia::~ExceptionSnapshotFuchsia() = default;
 
-void ExceptionSnapshotFuchsia::Initialize(
+bool ExceptionSnapshotFuchsia::Initialize(
     ProcessReaderFuchsia* process_reader,
     zx_koid_t thread_id,
     const zx_exception_report_t& exception_report) {
@@ -61,22 +61,26 @@ void ExceptionSnapshotFuchsia::Initialize(
                    [thread_id](const ProcessReaderFuchsia::Thread& thread) {
                      return thread.id == thread_id;
                    });
-  if (t != threads.end()) {
+  if (t == threads.end()) {
+    // If no threads have been read, then context_ can't be initalized, and the
+    // exception snapshot can't be considered initialized_.
+    return false;
+  }
+
 #if defined(ARCH_CPU_X86_64)
-    context_.architecture = kCPUArchitectureX86_64;
-    context_.x86_64 = &context_arch_;
-    // TODO(fxbug.dev/5496): Add float context once saved in |t|.
-    InitializeCPUContextX86_64_NoFloatingPoint(t->general_registers,
-                                               context_.x86_64);
+  context_.architecture = kCPUArchitectureX86_64;
+  context_.x86_64 = &context_arch_;
+  // TODO(fxbug.dev/5496): Add float context once saved in |t|.
+  InitializeCPUContextX86_64_NoFloatingPoint(t->general_registers,
+                                             context_.x86_64);
 #elif defined(ARCH_CPU_ARM64)
-    context_.architecture = kCPUArchitectureARM64;
-    context_.arm64 = &context_arch_;
-    InitializeCPUContextARM64(
-        t->general_registers, t->vector_registers, context_.arm64);
+  context_.architecture = kCPUArchitectureARM64;
+  context_.arm64 = &context_arch_;
+  InitializeCPUContextARM64(
+      t->general_registers, t->vector_registers, context_.arm64);
 #else
 #error Port.
 #endif
-  }
 
   if (context_.InstructionPointer() != 0 &&
       (exception_ == ZX_EXCP_UNDEFINED_INSTRUCTION ||
@@ -94,6 +98,7 @@ void ExceptionSnapshotFuchsia::Initialize(
   }
 
   INITIALIZATION_STATE_SET_VALID(initialized_);
+  return true;
 }
 
 const CPUContext* ExceptionSnapshotFuchsia::Context() const {

third_party/crashpad/crashpad/snapshot/fuchsia/exception_snapshot_fuchsia.h

@@ -44,7 +44,10 @@ class ExceptionSnapshotFuchsia final : public ExceptionSnapshot {
   //! \param[in] thread_id The koid of the thread that sustained the exception.
   //! \param[in] exception_report The `zx_exception_report_t` retrieved from the
   //!     thread in the exception state, corresponding to \a thread_id.
-  void Initialize(ProcessReaderFuchsia* process_reader,
+  //!
+  //! \return `true` if the exception data was initialized, `false` otherwise
+  //!     with an error logged.
+  bool Initialize(ProcessReaderFuchsia* process_reader,
                   zx_koid_t thread_id,
                   const zx_exception_report_t& exception_report);
 
@@ -63,7 +66,7 @@ class ExceptionSnapshotFuchsia final : public ExceptionSnapshot {
 #elif defined(ARCH_CPU_ARM64)
   CPUContextARM64 context_arch_;
 #endif
-  CPUContext context_ = {};
+  CPUContext context_;
   std::vector<uint64_t> codes_;
   zx_koid_t thread_id_;
   zx_vaddr_t exception_address_;

third_party/crashpad/crashpad/snapshot/fuchsia/process_snapshot_fuchsia.cc

@@ -59,9 +59,14 @@ bool ProcessSnapshotFuchsia::InitializeException(
     zx_koid_t thread_id,
     const zx_exception_report_t& report) {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
-  exception_.reset(new internal::ExceptionSnapshotFuchsia());
-  exception_->Initialize(&process_reader_, thread_id, report);
-  return true;
+
+  std::unique_ptr<internal::ExceptionSnapshotFuchsia> exception(
+      new internal::ExceptionSnapshotFuchsia());
+  if (exception->Initialize(&process_reader_, thread_id, report)) {
+    exception_.swap(exception);
+    return true;
+  }
+  return false;
 }
 
 void ProcessSnapshotFuchsia::GetCrashpadOptions(

third_party/crashpad/crashpad/snapshot/mac/system_snapshot_mac.cc

@@ -178,10 +178,8 @@ uint32_t SystemSnapshotMac::CPURevision() const {
 
   return (family << 16) | (model << 8) | stepping;
 #elif defined(ARCH_CPU_ARM64)
-  // TODO(macos_arm64): Verify that this is correct, and pack more information
-  // if feasible. The Apple A12Z returns hw.cputype = 0x100000c and
-  // hw.cpusubtype = 2.
-  return CastIntSysctlByName<uint32_t>("hw.cputype", 0);
+  // TODO(macos_arm64): Verify and test.
+  return CastIntSysctlByName<uint32_t>("hw.cpufamily", 0);
 #else
 #error port to your architecture
 #endif

third_party/crashpad/crashpad/test/BUILD.gn

@@ -152,7 +152,7 @@ static_library("test") {
   if (crashpad_is_fuchsia) {
     public_deps = [ "../third_party/fuchsia" ]
     if (crashpad_is_in_fuchsia) {
-      deps += [ "//zircon/public/lib/fdio" ]
+      deps += [ "//sdk/lib/fdio" ]
     }
   }
 }

third_party/crashpad/crashpad/third_party/cpp-httplib/BUILD.gn

@@ -16,4 +16,5 @@ source_set("cpp-httplib") {
   testonly = true
   include_dirs = [ "cpp-httplib" ]
   sources = [ "cpp-httplib/httplib.h" ]
+  deps = [ "../zlib" ]
 }

third_party/crashpad/crashpad/third_party/fuchsia/BUILD.gn

@@ -17,7 +17,7 @@ import("../../build/crashpad_buildconfig.gni")
 if (crashpad_is_in_fuchsia) {
   group("fuchsia") {
     public_deps = [
-      "//zircon/public/lib/fdio",
+      "//sdk/lib/fdio",
       "//zircon/public/lib/zx",
     ]
   }

third_party/crashpad/crashpad/third_party/googletest/BUILD.gn

@@ -34,58 +34,64 @@ if (crashpad_is_in_chromium) {
     testonly = true
     public_deps = [ "//third_party/googletest:gmock" ]
   }
-} else if (crashpad_is_standalone) {
+} else if (crashpad_is_standalone || crashpad_is_external) {
+  if (crashpad_is_standalone) {
+    googletest_dir = "googletest"
+    mini_chromium_dir = "//third_party/mini_chromium/mini_chromium"
+  } else if (crashpad_is_external) {
+    googletest_dir = "../../../../googletest"
+    mini_chromium_dir = "//../../mini_chromium/mini_chromium"
+  }
+
   config("googletest_private_config") {
     visibility = [ ":*" ]
-    include_dirs = [ "googletest/googletest" ]
+    include_dirs = [ "$googletest_dir/googletest" ]
     defines = [ "GUNIT_NO_GOOGLE3=1" ]
   }
 
   config("googletest_public_config") {
-    include_dirs = [ "googletest/googletest/include" ]
+    include_dirs = [ "$googletest_dir/googletest/include" ]
   }
 
   static_library("googletest") {
     testonly = true
     sources = [
-      "googletest/googletest/include/gtest/gtest-death-test.h",
-      "googletest/googletest/include/gtest/gtest-matchers.h",
-      "googletest/googletest/include/gtest/gtest-message.h",
-      "googletest/googletest/include/gtest/gtest-param-test.h",
-      "googletest/googletest/include/gtest/gtest-printers.h",
-      "googletest/googletest/include/gtest/gtest-spi.h",
-      "googletest/googletest/include/gtest/gtest-test-part.h",
-      "googletest/googletest/include/gtest/gtest-typed-test.h",
-      "googletest/googletest/include/gtest/gtest.h",
-      "googletest/googletest/include/gtest/gtest_pred_impl.h",
-      "googletest/googletest/include/gtest/gtest_prod.h",
-      "googletest/googletest/include/gtest/internal/custom/gtest-port.h",
-      "googletest/googletest/include/gtest/internal/custom/gtest-printers.h",
-      "googletest/googletest/include/gtest/internal/custom/gtest.h",
-      "googletest/googletest/include/gtest/internal/gtest-death-test-internal.h",
-      "googletest/googletest/include/gtest/internal/gtest-filepath.h",
-      "googletest/googletest/include/gtest/internal/gtest-internal.h",
-      "googletest/googletest/include/gtest/internal/gtest-param-util.h",
-      "googletest/googletest/include/gtest/internal/gtest-port-arch.h",
-      "googletest/googletest/include/gtest/internal/gtest-port.h",
-      "googletest/googletest/include/gtest/internal/gtest-string.h",
-      "googletest/googletest/include/gtest/internal/gtest-type-util.h",
-      "googletest/googletest/src/gtest-all.cc",
-      "googletest/googletest/src/gtest-death-test.cc",
-      "googletest/googletest/src/gtest-filepath.cc",
-      "googletest/googletest/src/gtest-internal-inl.h",
-      "googletest/googletest/src/gtest-matchers.cc",
-      "googletest/googletest/src/gtest-port.cc",
-      "googletest/googletest/src/gtest-printers.cc",
-      "googletest/googletest/src/gtest-test-part.cc",
-      "googletest/googletest/src/gtest-typed-test.cc",
-      "googletest/googletest/src/gtest.cc",
+      "$googletest_dir/googletest/include/gtest/gtest-death-test.h",
+      "$googletest_dir/googletest/include/gtest/gtest-matchers.h",
+      "$googletest_dir/googletest/include/gtest/gtest-message.h",
+      "$googletest_dir/googletest/include/gtest/gtest-param-test.h",
+      "$googletest_dir/googletest/include/gtest/gtest-printers.h",
+      "$googletest_dir/googletest/include/gtest/gtest-spi.h",
+      "$googletest_dir/googletest/include/gtest/gtest-test-part.h",
+      "$googletest_dir/googletest/include/gtest/gtest-typed-test.h",
+      "$googletest_dir/googletest/include/gtest/gtest.h",
+      "$googletest_dir/googletest/include/gtest/gtest_pred_impl.h",
+      "$googletest_dir/googletest/include/gtest/gtest_prod.h",
+      "$googletest_dir/googletest/include/gtest/internal/custom/gtest-port.h",
+      "$googletest_dir/googletest/include/gtest/internal/custom/gtest-printers.h",
+      "$googletest_dir/googletest/include/gtest/internal/custom/gtest.h",
+      "$googletest_dir/googletest/include/gtest/internal/gtest-death-test-internal.h",
+      "$googletest_dir/googletest/include/gtest/internal/gtest-filepath.h",
+      "$googletest_dir/googletest/include/gtest/internal/gtest-internal.h",
+      "$googletest_dir/googletest/include/gtest/internal/gtest-param-util.h",
+      "$googletest_dir/googletest/include/gtest/internal/gtest-port-arch.h",
+      "$googletest_dir/googletest/include/gtest/internal/gtest-port.h",
+      "$googletest_dir/googletest/include/gtest/internal/gtest-string.h",
+      "$googletest_dir/googletest/include/gtest/internal/gtest-type-util.h",
+      "$googletest_dir/googletest/src/gtest-all.cc",
+      "$googletest_dir/googletest/src/gtest-death-test.cc",
+      "$googletest_dir/googletest/src/gtest-filepath.cc",
+      "$googletest_dir/googletest/src/gtest-internal-inl.h",
+      "$googletest_dir/googletest/src/gtest-matchers.cc",
+      "$googletest_dir/googletest/src/gtest-port.cc",
+      "$googletest_dir/googletest/src/gtest-printers.cc",
+      "$googletest_dir/googletest/src/gtest-test-part.cc",
+      "$googletest_dir/googletest/src/gtest-typed-test.cc",
+      "$googletest_dir/googletest/src/gtest.cc",
     ]
-    sources -= [ "googletest/googletest/src/gtest-all.cc" ]
+    sources -= [ "$googletest_dir/googletest/src/gtest-all.cc" ]
     public_configs = [ ":googletest_public_config" ]
-    configs -= [
-      "//third_party/mini_chromium/mini_chromium/build:Wexit_time_destructors",
-    ]
+    configs -= [ "$mini_chromium_dir/build:Wexit_time_destructors" ]
     configs += [ ":googletest_private_config" ]
     if (crashpad_is_fuchsia) {
       deps = [ "../fuchsia" ]
@@ -97,33 +103,31 @@ if (crashpad_is_in_chromium) {
     visibility = [ ":*" ]
 
     testonly = true
-    sources = [ "googletest/googletest/src/gtest_main.cc" ]
+    sources = [ "$googletest_dir/googletest/src/gtest_main.cc" ]
     deps = [ ":googletest" ]
   }
 
   test("gtest_all_test") {
     sources = [
-      "googletest/googletest/test/googletest-death-test-test.cc",
-      "googletest/googletest/test/googletest-filepath-test.cc",
-      "googletest/googletest/test/googletest-message-test.cc",
-      "googletest/googletest/test/googletest-options-test.cc",
-      "googletest/googletest/test/googletest-port-test.cc",
-      "googletest/googletest/test/googletest-printers-test.cc",
-      "googletest/googletest/test/googletest-test-part-test.cc",
-      "googletest/googletest/test/gtest-typed-test2_test.cc",
-      "googletest/googletest/test/gtest-typed-test_test.cc",
-      "googletest/googletest/test/gtest-typed-test_test.h",
-      "googletest/googletest/test/gtest_main_unittest.cc",
-      "googletest/googletest/test/gtest_pred_impl_unittest.cc",
-      "googletest/googletest/test/gtest_prod_test.cc",
-      "googletest/googletest/test/gtest_skip_test.cc",
-      "googletest/googletest/test/gtest_unittest.cc",
-      "googletest/googletest/test/production.cc",
-      "googletest/googletest/test/production.h",
-    ]
-    configs -= [
-      "//third_party/mini_chromium/mini_chromium/build:Wexit_time_destructors",
+      "$googletest_dir/googletest/test/googletest-death-test-test.cc",
+      "$googletest_dir/googletest/test/googletest-filepath-test.cc",
+      "$googletest_dir/googletest/test/googletest-message-test.cc",
+      "$googletest_dir/googletest/test/googletest-options-test.cc",
+      "$googletest_dir/googletest/test/googletest-port-test.cc",
+      "$googletest_dir/googletest/test/googletest-printers-test.cc",
+      "$googletest_dir/googletest/test/googletest-test-part-test.cc",
+      "$googletest_dir/googletest/test/gtest-typed-test2_test.cc",
+      "$googletest_dir/googletest/test/gtest-typed-test_test.cc",
+      "$googletest_dir/googletest/test/gtest-typed-test_test.h",
+      "$googletest_dir/googletest/test/gtest_main_unittest.cc",
+      "$googletest_dir/googletest/test/gtest_pred_impl_unittest.cc",
+      "$googletest_dir/googletest/test/gtest_prod_test.cc",
+      "$googletest_dir/googletest/test/gtest_skip_test.cc",
+      "$googletest_dir/googletest/test/gtest_unittest.cc",
+      "$googletest_dir/googletest/test/production.cc",
+      "$googletest_dir/googletest/test/production.h",
     ]
+    configs -= [ "$mini_chromium_dir/build:Wexit_time_destructors" ]
     configs += [ ":googletest_private_config" ]
     deps = [
       ":googletest",
@@ -136,37 +140,33 @@ if (crashpad_is_in_chromium) {
   }
 
   test("gtest_environment_test") {
-    sources = [ "googletest/googletest/test/gtest_environment_test.cc" ]
+    sources = [ "$googletest_dir/googletest/test/gtest_environment_test.cc" ]
     configs += [ ":googletest_private_config" ]
     deps = [ ":googletest" ]
   }
 
   test("gtest_listener_test") {
-    sources = [ "googletest/googletest/test/googletest-listener-test.cc" ]
+    sources = [ "$googletest_dir/googletest/test/googletest-listener-test.cc" ]
     deps = [ ":googletest" ]
   }
 
   test("gtest_macro_stack_footprint_test") {
-    sources = [
-      "googletest/googletest/test/gtest_test_macro_stack_footprint_test.cc",
-    ]
+    sources = [ "$googletest_dir/googletest/test/gtest_test_macro_stack_footprint_test.cc" ]
     deps = [ ":googletest" ]
   }
 
   test("gtest_no_test") {
-    sources = [ "googletest/googletest/test/gtest_no_test_unittest.cc" ]
+    sources = [ "$googletest_dir/googletest/test/gtest_no_test_unittest.cc" ]
     deps = [ ":googletest" ]
   }
 
   test("gtest_param_test") {
     sources = [
-      "googletest/googletest/test/googletest-param-test-test.cc",
-      "googletest/googletest/test/googletest-param-test-test.h",
-      "googletest/googletest/test/googletest-param-test2-test.cc",
-    ]
-    configs -= [
-      "//third_party/mini_chromium/mini_chromium/build:Wexit_time_destructors",
+      "$googletest_dir/googletest/test/googletest-param-test-test.cc",
+      "$googletest_dir/googletest/test/googletest-param-test-test.h",
+      "$googletest_dir/googletest/test/googletest-param-test2-test.cc",
     ]
+    configs -= [ "$mini_chromium_dir/build:Wexit_time_destructors" ]
     configs += [ ":googletest_private_config" ]
     deps = [ ":googletest" ]
 
@@ -180,24 +180,25 @@ if (crashpad_is_in_chromium) {
   }
 
   test("gtest_premature_exit_test") {
-    sources = [ "googletest/googletest/test/gtest_premature_exit_test.cc" ]
+    sources = [ "$googletest_dir/googletest/test/gtest_premature_exit_test.cc" ]
     deps = [ ":googletest" ]
   }
 
   test("gtest_repeat_test") {
-    sources = [ "googletest/googletest/test/gtest_repeat_test.cc" ]
+    sources = [ "$googletest_dir/googletest/test/gtest_repeat_test.cc" ]
     configs += [ ":googletest_private_config" ]
     deps = [ ":googletest" ]
   }
 
   test("gtest_skip_in_environment_setup_test") {
-    sources =
-        [ "googletest/googletest/test/gtest_skip_in_environment_setup_test.cc" ]
+    sources = [
+      "$googletest_dir/googletest/test/gtest_skip_in_environment_setup_test.cc",
+    ]
     deps = [ ":googletest" ]
   }
 
   test("gtest_sole_header_test") {
-    sources = [ "googletest/googletest/test/gtest_sole_header_test.cc" ]
+    sources = [ "$googletest_dir/googletest/test/gtest_sole_header_test.cc" ]
     deps = [
       ":googletest",
       ":googletest_main",
@@ -205,13 +206,13 @@ if (crashpad_is_in_chromium) {
   }
 
   test("gtest_stress_test") {
-    sources = [ "googletest/googletest/test/gtest_stress_test.cc" ]
+    sources = [ "$googletest_dir/googletest/test/gtest_stress_test.cc" ]
     configs += [ ":googletest_private_config" ]
     deps = [ ":googletest" ]
   }
 
   test("gtest_unittest_api_test") {
-    sources = [ "googletest/googletest/test/gtest-unittest-api_test.cc" ]
+    sources = [ "$googletest_dir/googletest/test/gtest-unittest-api_test.cc" ]
     deps = [ ":googletest" ]
   }
 
@@ -235,11 +236,11 @@ if (crashpad_is_in_chromium) {
 
   config("googlemock_private_config") {
     visibility = [ ":*" ]
-    include_dirs = [ "googletest/googlemock" ]
+    include_dirs = [ "$googletest_dir/googlemock" ]
   }
 
   config("googlemock_public_config") {
-    include_dirs = [ "googletest/googlemock/include" ]
+    include_dirs = [ "$googletest_dir/googlemock/include" ]
 
     if (crashpad_is_clang) {
       cflags_cc = [
@@ -256,34 +257,32 @@ if (crashpad_is_in_chromium) {
   static_library("googlemock") {
     testonly = true
     sources = [
-      "googletest/googlemock/include/gmock/gmock-actions.h",
-      "googletest/googlemock/include/gmock/gmock-cardinalities.h",
-      "googletest/googlemock/include/gmock/gmock-function-mocker.h",
-      "googletest/googlemock/include/gmock/gmock-generated-actions.h",
-      "googletest/googlemock/include/gmock/gmock-matchers.h",
-      "googletest/googlemock/include/gmock/gmock-more-actions.h",
-      "googletest/googlemock/include/gmock/gmock-more-matchers.h",
-      "googletest/googlemock/include/gmock/gmock-nice-strict.h",
-      "googletest/googlemock/include/gmock/gmock-spec-builders.h",
-      "googletest/googlemock/include/gmock/gmock.h",
-      "googletest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h",
-      "googletest/googlemock/include/gmock/internal/custom/gmock-matchers.h",
-      "googletest/googlemock/include/gmock/internal/custom/gmock-port.h",
-      "googletest/googlemock/include/gmock/internal/gmock-internal-utils.h",
-      "googletest/googlemock/include/gmock/internal/gmock-port.h",
-      "googletest/googlemock/include/gmock/internal/gmock-pp.h",
-      "googletest/googlemock/src/gmock-all.cc",
-      "googletest/googlemock/src/gmock-cardinalities.cc",
-      "googletest/googlemock/src/gmock-internal-utils.cc",
-      "googletest/googlemock/src/gmock-matchers.cc",
-      "googletest/googlemock/src/gmock-spec-builders.cc",
-      "googletest/googlemock/src/gmock.cc",
+      "$googletest_dir/googlemock/include/gmock/gmock-actions.h",
+      "$googletest_dir/googlemock/include/gmock/gmock-cardinalities.h",
+      "$googletest_dir/googlemock/include/gmock/gmock-function-mocker.h",
+      "$googletest_dir/googlemock/include/gmock/gmock-generated-actions.h",
+      "$googletest_dir/googlemock/include/gmock/gmock-matchers.h",
+      "$googletest_dir/googlemock/include/gmock/gmock-more-actions.h",
+      "$googletest_dir/googlemock/include/gmock/gmock-more-matchers.h",
+      "$googletest_dir/googlemock/include/gmock/gmock-nice-strict.h",
+      "$googletest_dir/googlemock/include/gmock/gmock-spec-builders.h",
+      "$googletest_dir/googlemock/include/gmock/gmock.h",
+      "$googletest_dir/googlemock/include/gmock/internal/custom/gmock-generated-actions.h",
+      "$googletest_dir/googlemock/include/gmock/internal/custom/gmock-matchers.h",
+      "$googletest_dir/googlemock/include/gmock/internal/custom/gmock-port.h",
+      "$googletest_dir/googlemock/include/gmock/internal/gmock-internal-utils.h",
+      "$googletest_dir/googlemock/include/gmock/internal/gmock-port.h",
+      "$googletest_dir/googlemock/include/gmock/internal/gmock-pp.h",
+      "$googletest_dir/googlemock/src/gmock-all.cc",
+      "$googletest_dir/googlemock/src/gmock-cardinalities.cc",
+      "$googletest_dir/googlemock/src/gmock-internal-utils.cc",
+      "$googletest_dir/googlemock/src/gmock-matchers.cc",
+      "$googletest_dir/googlemock/src/gmock-spec-builders.cc",
+      "$googletest_dir/googlemock/src/gmock.cc",
     ]
-    sources -= [ "googletest/googlemock/src/gmock-all.cc" ]
+    sources -= [ "$googletest_dir/googlemock/src/gmock-all.cc" ]
     public_configs = [ ":googlemock_public_config" ]
-    configs -= [
-      "//third_party/mini_chromium/mini_chromium/build:Wexit_time_destructors",
-    ]
+    configs -= [ "$mini_chromium_dir/build:Wexit_time_destructors" ]
     configs += [ ":googlemock_private_config" ]
     deps = [ ":googletest" ]
   }
@@ -292,7 +291,7 @@ if (crashpad_is_in_chromium) {
     # Tests outside of this file should use ../../test:googlemock_main instead.
     visibility = [ ":*" ]
     testonly = true
-    sources = [ "googletest/googlemock/src/gmock_main.cc" ]
+    sources = [ "$googletest_dir/googlemock/src/gmock_main.cc" ]
     deps = [
       ":googlemock",
       ":googletest",
@@ -301,20 +300,20 @@ if (crashpad_is_in_chromium) {
 
   test("gmock_all_test") {
     sources = [
-      "googletest/googlemock/test/gmock-actions_test.cc",
-      "googletest/googlemock/test/gmock-cardinalities_test.cc",
-      "googletest/googlemock/test/gmock-function-mocker_test.cc",
-      "googletest/googlemock/test/gmock-generated-actions_test.cc",
-      "googletest/googlemock/test/gmock-generated-matchers_test.cc",
-      "googletest/googlemock/test/gmock-internal-utils_test.cc",
-      "googletest/googlemock/test/gmock-matchers_test.cc",
-      "googletest/googlemock/test/gmock-more-actions_test.cc",
-      "googletest/googlemock/test/gmock-nice-strict_test.cc",
-      "googletest/googlemock/test/gmock-port_test.cc",
-      "googletest/googlemock/test/gmock-pp-string_test.cc",
-      "googletest/googlemock/test/gmock-pp_test.cc",
-      "googletest/googlemock/test/gmock-spec-builders_test.cc",
-      "googletest/googlemock/test/gmock_test.cc",
+      "$googletest_dir/googlemock/test/gmock-actions_test.cc",
+      "$googletest_dir/googlemock/test/gmock-cardinalities_test.cc",
+      "$googletest_dir/googlemock/test/gmock-function-mocker_test.cc",
+      "$googletest_dir/googlemock/test/gmock-generated-actions_test.cc",
+      "$googletest_dir/googlemock/test/gmock-generated-matchers_test.cc",
+      "$googletest_dir/googlemock/test/gmock-internal-utils_test.cc",
+      "$googletest_dir/googlemock/test/gmock-matchers_test.cc",
+      "$googletest_dir/googlemock/test/gmock-more-actions_test.cc",
+      "$googletest_dir/googlemock/test/gmock-nice-strict_test.cc",
+      "$googletest_dir/googlemock/test/gmock-port_test.cc",
+      "$googletest_dir/googlemock/test/gmock-pp-string_test.cc",
+      "$googletest_dir/googlemock/test/gmock-pp_test.cc",
+      "$googletest_dir/googlemock/test/gmock-spec-builders_test.cc",
+      "$googletest_dir/googlemock/test/gmock_test.cc",
     ]
     configs += [
       ":googlemock_private_config",
@@ -337,9 +336,9 @@ if (crashpad_is_in_chromium) {
 
   test("gmock_link_test") {
     sources = [
-      "googletest/googlemock/test/gmock_link2_test.cc",
-      "googletest/googlemock/test/gmock_link_test.cc",
-      "googletest/googlemock/test/gmock_link_test.h",
+      "$googletest_dir/googlemock/test/gmock_link2_test.cc",
+      "$googletest_dir/googlemock/test/gmock_link_test.cc",
+      "$googletest_dir/googlemock/test/gmock_link_test.h",
     ]
     configs += [ ":googlemock_private_config" ]
     deps = [
@@ -350,10 +349,8 @@ if (crashpad_is_in_chromium) {
   }
 
   test("gmock_stress_test") {
-    sources = [ "googletest/googlemock/test/gmock_stress_test.cc" ]
-    configs -= [
-      "//third_party/mini_chromium/mini_chromium/build:Wexit_time_destructors",
-    ]
+    sources = [ "$googletest_dir/googlemock/test/gmock_stress_test.cc" ]
+    configs -= [ "$mini_chromium_dir/build:Wexit_time_destructors" ]
     configs += [ ":googlemock_private_config" ]
     deps = [
       ":googlemock",

third_party/crashpad/crashpad/third_party/mini_chromium/BUILD.gn

@@ -19,6 +19,8 @@ group("base") {
     public_deps = [ "//base" ]
   } else if (crashpad_is_standalone || crashpad_is_in_fuchsia) {
     public_deps = [ "mini_chromium/base" ]
+  } else if (crashpad_is_external) {
+    public_deps = [ "../../../../mini_chromium/mini_chromium/base" ]
   } else if (crashpad_is_in_dart) {
     public_deps = [ "//third_party/mini_chromium/mini_chromium/base" ]
   }

third_party/crashpad/crashpad/third_party/zlib/BUILD.gn

@@ -18,8 +18,10 @@ if (crashpad_is_in_chromium || crashpad_is_in_fuchsia || crashpad_is_in_dart) {
   zlib_source = "external"
 } else if (!crashpad_is_win && !crashpad_is_fuchsia) {
   zlib_source = "system"
-} else {
+} else if (crashpad_is_standalone) {
   zlib_source = "embedded"
+} else if (crashpad_is_external) {
+  zlib_source = "external_with_embedded_build"
 }
 
 config("zlib_config") {
@@ -30,6 +32,9 @@ config("zlib_config") {
   } else if (zlib_source == "embedded") {
     defines = [ "CRASHPAD_ZLIB_SOURCE_EMBEDDED" ]
     include_dirs = [ "zlib" ]
+  } else if (zlib_source == "external_with_embedded_build") {
+    defines = [ "CRASHPAD_ZLIB_SOURCE_EXTERNAL_WITH_EMBEDDED_BUILD" ]
+    include_dirs = [ "../../../../zlib/src" ]
   }
 }
 
@@ -43,36 +48,41 @@ if (zlib_source == "external") {
     public_configs = [ ":zlib_config" ]
     libs = [ "z" ]
   }
-} else if (zlib_source == "embedded") {
+} else if (zlib_source == "embedded" ||
+           zlib_source == "external_with_embedded_build") {
   static_library("zlib") {
+    if (zlib_source == "embedded") {
+      zlib_dir = "zlib"
+    } else if (zlib_source == "external_with_embedded_build") {
+      zlib_dir = "../../../../zlib/src"
+    }
     sources = [
-      "zlib/adler32.c",
-      "zlib/compress.c",
-      "zlib/crc32.c",
-      "zlib/crc32.h",
-      "zlib/deflate.c",
-      "zlib/deflate.h",
-      "zlib/gzclose.c",
-      "zlib/gzguts.h",
-      "zlib/gzlib.c",
-      "zlib/gzread.c",
-      "zlib/gzwrite.c",
-      "zlib/infback.c",
-      "zlib/inffast.c",
-      "zlib/inffast.h",
-      "zlib/inffixed.h",
-      "zlib/inflate.c",
-      "zlib/inflate.h",
-      "zlib/inftrees.c",
-      "zlib/inftrees.h",
-      "zlib/names.h",
-      "zlib/trees.c",
-      "zlib/trees.h",
-      "zlib/uncompr.c",
-      "zlib/zconf.h",
-      "zlib/zlib.h",
-      "zlib/zutil.c",
-      "zlib/zutil.h",
+      "$zlib_dir/adler32.c",
+      "$zlib_dir/compress.c",
+      "$zlib_dir/crc32.c",
+      "$zlib_dir/crc32.h",
+      "$zlib_dir/deflate.c",
+      "$zlib_dir/deflate.h",
+      "$zlib_dir/gzclose.c",
+      "$zlib_dir/gzguts.h",
+      "$zlib_dir/gzlib.c",
+      "$zlib_dir/gzread.c",
+      "$zlib_dir/gzwrite.c",
+      "$zlib_dir/infback.c",
+      "$zlib_dir/inffast.c",
+      "$zlib_dir/inffast.h",
+      "$zlib_dir/inffixed.h",
+      "$zlib_dir/inflate.c",
+      "$zlib_dir/inflate.h",
+      "$zlib_dir/inftrees.c",
+      "$zlib_dir/inftrees.h",
+      "$zlib_dir/trees.c",
+      "$zlib_dir/trees.h",
+      "$zlib_dir/uncompr.c",
+      "$zlib_dir/zconf.h",
+      "$zlib_dir/zlib.h",
+      "$zlib_dir/zutil.c",
+      "$zlib_dir/zutil.h",
       "zlib_crashpad.h",
     ]
 
@@ -102,28 +112,37 @@ if (zlib_source == "external") {
       ]
     }
 
-    configs -= [
-      "//third_party/mini_chromium/mini_chromium/build:Wimplicit_fallthrough",
-    ]
-
-    if (current_cpu == "x86" || current_cpu == "x64") {
-      sources += [
-        "zlib/crc_folding.c",
-        "zlib/fill_window_sse.c",
-        "zlib/x86.c",
-        "zlib/x86.h",
+    if (crashpad_is_standalone) {
+      configs -= [
+        "//third_party/mini_chromium/mini_chromium/build:Wimplicit_fallthrough",
       ]
-      if (!crashpad_is_win || crashpad_is_clang) {
-        cflags += [
-          "-msse4.2",
-          "-mpclmul",
+    } else if (crashpad_is_external) {
+      configs -=
+          [ "//../../mini_chromium/mini_chromium/build:Wimplicit_fallthrough" ]
+    }
+
+    if (zlib_source == "embedded") {
+      sources += [ "$zlib_dir/names.h" ]
+
+      if (current_cpu == "x86" || current_cpu == "x64") {
+        sources += [
+          "$zlib_dir/crc_folding.c",
+          "$zlib_dir/fill_window_sse.c",
+          "$zlib_dir/x86.c",
+          "$zlib_dir/x86.h",
         ]
+        if (!crashpad_is_win || crashpad_is_clang) {
+          cflags += [
+            "-msse4.2",
+            "-mpclmul",
+          ]
+        }
+        if (crashpad_is_clang) {
+          cflags += [ "-Wno-incompatible-pointer-types" ]
+        }
+      } else {
+        sources += [ "$zlib_dir/simd_stub.c" ]
       }
-      if (crashpad_is_clang) {
-        cflags += [ "-Wno-incompatible-pointer-types" ]
-      }
-    } else {
-      sources += [ "zlib/simd_stub.c" ]
     }
   }
 }

third_party/crashpad/crashpad/third_party/zlib/zlib_crashpad.h

@@ -19,8 +19,9 @@
 // available at any other location in the source tree. It will #include the
 // proper <zlib.h> depending on how the build has been configured.
 
-#if defined(CRASHPAD_ZLIB_SOURCE_SYSTEM) || \
-    defined(CRASHPAD_ZLIB_SOURCE_EXTERNAL)
+#if defined(CRASHPAD_ZLIB_SOURCE_SYSTEM) ||   \
+    defined(CRASHPAD_ZLIB_SOURCE_EXTERNAL) || \
+    defined(CRASHPAD_ZLIB_SOURCE_EXTERNAL_WITH_EMBEDDED_BUILD)
 #include <zlib.h>
 #elif defined(CRASHPAD_ZLIB_SOURCE_EMBEDDED)
 #include "third_party/zlib/zlib/zlib.h"

third_party/crashpad/crashpad/util/BUILD.gn

@@ -25,6 +25,8 @@ if (crashpad_is_in_chromium) {
 if (crashpad_is_mac || crashpad_is_ios) {
   if (crashpad_is_in_chromium || crashpad_is_in_fuchsia) {
     import("//build/config/sysroot.gni")
+  } else if (crashpad_is_external) {
+    import("../../../mini_chromium/mini_chromium/build/sysroot.gni")
   } else {
     import("//third_party/mini_chromium/mini_chromium/build/sysroot.gni")
   }
@@ -627,6 +629,9 @@ if (!crashpad_is_android && !crashpad_is_ios) {
 
     if (crashpad_is_standalone) {
       remove_configs = [ "//third_party/mini_chromium/mini_chromium/build:Wexit_time_destructors" ]
+    } else if (crashpad_is_external) {
+      remove_configs =
+          [ "//../../mini_chromium/mini_chromium/build:Wexit_time_destructors" ]
     }
 
     if (crashpad_is_win) {

third_party/crashpad/crashpad/util/posix/scoped_mmap.cc

@@ -121,4 +121,11 @@ bool ScopedMmap::Mprotect(int prot) {
   return true;
 }
 
+void* ScopedMmap::release() {
+  void* retval = addr_;
+  addr_ = MAP_FAILED;
+  len_ = 0;
+  return retval;
+}
+
 }  // namespace crashpad

third_party/crashpad/crashpad/util/posix/scoped_mmap.h

@@ -77,6 +77,10 @@ class ScopedMmap {
   //! \return `true` on success. `false` on failure, with a message logged.
   bool Mprotect(int prot);
 
+  //! \brief Returns the base address of the memory-mapped region and releases
+  //!     ownership.
+  void* release();
+
   //! \return Whether this object is managing a valid memory-mapped region.
   bool is_valid() const { return addr_ != MAP_FAILED; }
 

third_party/crashpad/crashpad/util/posix/scoped_mmap_test.cc

@@ -403,6 +403,19 @@ TEST(ScopedMmapDeathTest, Mprotect) {
   *addr = 2;
 }
 
+TEST(ScopedMmapTest, Release) {
+  ScopedMmap mapping;
+
+  const size_t kPageSize = base::checked_cast<size_t>(getpagesize());
+  ASSERT_TRUE(ScopedMmapResetMmap(&mapping, kPageSize));
+  ASSERT_TRUE(mapping.is_valid());
+
+  ScopedMmap mapping2;
+  ASSERT_TRUE(mapping2.ResetAddrLen(mapping.release(), kPageSize));
+  EXPECT_TRUE(mapping2.is_valid());
+  EXPECT_FALSE(mapping.is_valid());
+}
+
 }  // namespace
 }  // namespace test
 }  // namespace crashpad