diff --git a/patches/chrome-installer-mac-sign_chrome.py.patch b/patches/chrome-installer-mac-sign_chrome.py.patch deleted file mode 100644 index 419780cbe45c..000000000000 --- a/patches/chrome-installer-mac-sign_chrome.py.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/chrome/installer/mac/sign_chrome.py b/chrome/installer/mac/sign_chrome.py -index b1cb1f4beaca0f61cb4a1dff0039dcc02c2614f2..321a7c4802ed60bbb91fc918f4f33fce746a79b0 100755 ---- a/chrome/installer/mac/sign_chrome.py -+++ b/chrome/installer/mac/sign_chrome.py -@@ -44,6 +44,7 @@ def create_config(config_args, development): - from signing.chromium_config import ChromiumCodeSignConfig - config_class = ChromiumCodeSignConfig - -+ """ - # Then search for the internal config for Google Chrome. - try: - from signing.internal_config import InternalCodeSignConfig -@@ -53,6 +54,7 @@ def create_config(config_args, development): - # internal config has to be available. - if config_class.is_chrome_branded(): - raise e -+ """ - - if development: - -@@ -74,6 +76,8 @@ def create_config(config_args, development): - - config_class = DevelopmentCodeSignConfig - -+ from signing_helper import GetBraveSigningConfig -+ config_class = GetBraveSigningConfig(config_class, development) - return config_class(*config_args) - - diff --git a/patches/chrome-installer-mac-signing-config_factory.py.patch b/patches/chrome-installer-mac-signing-config_factory.py.patch new file mode 100644 index 000000000000..868a962f9627 --- /dev/null +++ b/patches/chrome-installer-mac-signing-config_factory.py.patch @@ -0,0 +1,13 @@ +diff --git a/chrome/installer/mac/signing/config_factory.py b/chrome/installer/mac/signing/config_factory.py +index 0689fb6476e741b711454aeaf4ac7c20d5e4f989..c303bb474dcf4036fc1e8d8b6985af20ae2e4f62 100644 +--- a/chrome/installer/mac/signing/config_factory.py ++++ b/chrome/installer/mac/signing/config_factory.py +@@ -8,6 +8,8 @@ def get_class(): + # First look up the processed Chromium config. + from chromium_config import ChromiumCodeSignConfig + config_class = ChromiumCodeSignConfig ++ from signing_helper import GetBraveSigningConfig ++ config_class = GetBraveSigningConfig(config_class) + + # Then search for the internal config for Google Chrome. + try: diff --git a/script/signing_helper.py b/script/signing_helper.py index cde0e0dbf552..39bfa08b218a 100644 --- a/script/signing_helper.py +++ b/script/signing_helper.py @@ -117,16 +117,20 @@ def AddBravePartsForSigning(parts, config): return parts -def GetBraveSigningConfig(config_class, development, mac_provisioning_profile=None): - if development: - return config_class +def GetBraveSigningConfig(config_class): + class ConfigNonChromeBranded(config_class): + + @staticmethod + def is_chrome_branded(): + return False - if mac_provisioning_profile is not None: - provisioning_profile = mac_provisioning_profile - else: - # Retrieve provisioning profile exported by build/mac/sign_app.sh - provisioning_profile = os.environ['MAC_PROVISIONING_PROFILE'] - assert len(provisioning_profile), 'MAC_PROVISIONING_PROFILE is not set' + config_class = ConfigNonChromeBranded + + # Retrieve provisioning profile exported by build/mac/sign_app.sh + # If not set, then it's development config. + provisioning_profile = os.environ['MAC_PROVISIONING_PROFILE'] + if !len(provisioning_profile): + return config_class class ProvisioningProfileCodeSignConfig(config_class):