Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove third_party-crashpad-crashpad-client-settings.cc.patch #8278

Merged
merged 1 commit into from
Mar 25, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions chromium_src/third_party/crashpad/crashpad/DEPS
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
include_rules = [
"+../../../../../../../third_party/crashpad/crashpad/util/net",
"+../../../../../../third_party/crashpad/crashpad/client",
"+third_party/crashpad/crashpad",
"+util/misc/uuid.h",
]
22 changes: 22 additions & 0 deletions chromium_src/third_party/crashpad/crashpad/client/settings.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/* Copyright (c) 2021 The Brave Authors. All rights reserved.
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at https://mozilla.org/MPL/2.0/. */

#include "third_party/crashpad/crashpad/client/settings.h"

#define GetClientID GetClientID_ChromiumImpl
#include "../../../../../../third_party/crashpad/crashpad/client/settings.cc"
#undef GetClientID

namespace crashpad {

bool Settings::GetClientID(UUID* client_id) {
if (!GetClientID_ChromiumImpl(client_id))
return false;

client_id->InitializeToZero();
return true;
}

} // namespace crashpad
19 changes: 19 additions & 0 deletions chromium_src/third_party/crashpad/crashpad/client/settings.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/* Copyright (c) 2021 The Brave Authors. All rights reserved.
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */

#ifndef BRAVE_CHROMIUM_SRC_THIRD_PARTY_CRASHPAD_CRASHPAD_CLIENT_SETTINGS_H_
#define BRAVE_CHROMIUM_SRC_THIRD_PARTY_CRASHPAD_CRASHPAD_CLIENT_SETTINGS_H_

#include "util/misc/uuid.h"

#define GetClientID \
GetClientID_ChromiumImpl(UUID* client_id); \
bool GetClientID

#include "../../../../../../third_party/crashpad/crashpad/client/settings.h"

#undef GetClientID

#endif // BRAVE_CHROMIUM_SRC_THIRD_PARTY_CRASHPAD_CRASHPAD_CLIENT_SETTINGS_H_
12 changes: 0 additions & 12 deletions patches/third_party-crashpad-crashpad-client-settings.cc.patch

This file was deleted.