    goma_prefix = ""
  }
 diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
-index 7a92debbf39a1cd3e9f911971025d0f5b35f2834..6d76992c6b88ba228e927246848f042a44692c10 100644
+index 7a92debbf39a1cd3e9f911971025d0f5b35f2834..467739cffc772f4fde25256cb2bcb37a2956f35c 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -35,6 +35,8 @@ if (is_android) {
+@@ -35,6 +35,11 @@ if (is_android) {
    import("//build_overrides/v8.gni")
    import("//media/cdm/ppapi/cdm_paths.gni")
    import("//third_party/icu/config.gni")
-+  chrome_product_full_name = "Google Chrome"
-+  chrome_product_short_name = "Google Chrome"
++  if (!muon_chromium_build) {
++    # Avoid mac app/framework naming conflicts
++    chrome_product_full_name = "Google Chrome"
++    chrome_product_short_name = "Google Chrome"
++  }
  }
  
  if (enable_resource_whitelist_generation) {
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index f7f50a0302dc5f0813cdae54beba7647b6eb75ee..49194d0f5115af1d3ccc25897cdf671e637ff24b 100644
+index 85dfe4f2467b2294f152348573515c803bbb57dc..d8091f0a0a39a4c059e089694ca41fa629e7d27f 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -3453,6 +3453,7 @@ split_static_library("browser") {
+@@ -3455,6 +3455,9 @@ split_static_library("browser") {
        "//device/battery",
        "//net:net_browser_services",
      ]
-+    include_dirs = [ "//electron" ]
++    if (!muon_chromium_build) {
++      include_dirs = [ "//electron" ]
++    }
    }
  
    if (!is_chrome_branded) {

diff --git a/build/config/chrome_build.gni b/build/config/chrome_build.gni
index c649018a7a0aeb20caeb2bf37c60d57c48630f1b..2cf3e988c452a015c24956dda7cc4292ee56e2e3 100644
--- a/build/config/chrome_build.gni
+++ b/build/config/chrome_build.gni
@@ -13,10 +13,12 @@ declare_args() {
   is_multi_dll_chrome = is_win && !is_component_build
 }
 
-# Refers to the subdirectory for branding in various places including
-# chrome/app/theme.
-if (is_chrome_branded) {
-  branding_path_component = "google_chrome"
-} else {
-  branding_path_component = "chromium"
+declare_args() {
+  # Refers to the subdirectory for branding in various places including
+  # chrome/app/theme.
+  if (is_chrome_branded) {
+    branding_path_component = "google_chrome"
+  } else {
+    branding_path_component = "chromium"
+  }
 }
diff --git a/build/toolchain/mac/BUILD.gn b/build/toolchain/mac/BUILD.gn
index 537c733e6873e3a4ed0d5609540fed92e46bae91..df12e8f7e067e7c7ccbd396cfbff108862764883 100644
--- a/build/toolchain/mac/BUILD.gn

index d0bbbf72ff0e356e424dc280eeb1441c990b5770..8e96ea5706f87ea98ba55fcb583b16a8035fa903 100644
--- a/chrome/common/chrome_paths_mac.mm
+++ b/chrome/common/chrome_paths_mac.mm
@@ -41,7 +41,9 @@ NSBundle* OuterAppBundleInternal() {
 
   // From C.app/Contents/Versions/1.2.3.4, go up three steps to get to C.app.
   base::FilePath versioned_dir = chrome::GetVersionedDirectory();
