Skip to content

Commit

Permalink
Remove chrome-installer-util-google_update_constants.cc.patch
Browse files Browse the repository at this point in the history
This patch can be removed in favour of chromium_src overrides to
redefine the values for the constants we're interested in.

Resolves brave/brave-browser#14339
  • Loading branch information
mariospr committed Feb 24, 2021
1 parent d852513 commit 7d5069f
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 29 deletions.
39 changes: 39 additions & 0 deletions chromium_src/chrome/installer/util/google_update_constants.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
/* 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/. */

#include "chrome/installer/util/google_update_constants.h"

#define kChromeUpgradeCode kChromeUpgradeCode_Unused
#define kGoogleUpdateUpgradeCode kGoogleUpdateUpgradeCode_Unused
#define kGoogleUpdateSetupExe kGoogleUpdateSetupExe_Unused
#define kRegPathClients kRegPathClients_Unused
#define kRegPathClientState kRegPathClientState_Unused
#define kRegPathClientStateMedium kRegPathClientStateMedium_Unused
#define kRegPathGoogleUpdate kRegPathGoogleUpdate_Unused

#include "../../../../../chrome/installer/util/google_update_constants.cc"

#undef kChromeUpgradeCode
#undef kGoogleUpdateUpgradeCode
#undef kGoogleUpdateSetupExe
#undef kRegPathClients
#undef kRegPathClientState
#undef kRegPathClientStateMedium
#undef kRegPathGoogleUpdate

namespace google_update {

const wchar_t kChromeUpgradeCode[] = L"{AFE6A462-C574-4B8A-AF43-4CC60DF4563B}";
const wchar_t kGoogleUpdateUpgradeCode[] =
L"{B131C935-9BE6-41DA-9599-1F776BEB8019}";
const wchar_t kGoogleUpdateSetupExe[] = L"BraveUpdateSetup.exe";
const wchar_t kRegPathClients[] = L"Software\\BraveSoftware\\Update\\Clients";
const wchar_t kRegPathClientState[] =
L"Software\\BraveSoftware\\Update\\ClientState";
const wchar_t kRegPathClientStateMedium[] =
L"Software\\BraveSoftware\\Update\\ClientStateMedium";
const wchar_t kRegPathGoogleUpdate[] = L"Software\\BraveSoftware\\Update";

} // namespace google_update
29 changes: 0 additions & 29 deletions patches/chrome-installer-util-google_update_constants.cc.patch

This file was deleted.

0 comments on commit 7d5069f

Please sign in to comment.