Skip to content

Commit

Permalink
Remove chrome-installer-util-util_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#14340
  • Loading branch information
mariospr committed Feb 24, 2021
1 parent d852513 commit 0ef49fc
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 29 deletions.
31 changes: 31 additions & 0 deletions chromium_src/chrome/installer/util/util_constants.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
/* 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/util_constants.h"

#define kGoogleUpdateIsMachineEnvVar kGoogleUpdateIsMachineEnvVar_ChromiumImpl
#define kChromeExe kChromeExe_Unused

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

#undef kGoogleUpdateIsMachineEnvVar
#undef kChromeExe

namespace installer {

namespace env_vars {

#if defined(OFFICIAL_BUILD)
const char kGoogleUpdateIsMachineEnvVar[] = "BraveSoftwareUpdateIsMachine";
#else
const char kGoogleUpdateIsMachineEnvVar[] =
kGoogleUpdateIsMachineEnvVar_ChromiumImpl;
#endif

} // namespace env_vars

const wchar_t kChromeExe[] = L"brave.exe";

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

This file was deleted.

0 comments on commit 0ef49fc

Please sign in to comment.