BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

5 files changed, 18 insertions, 6 deletions

diff --git a/chromium/build/config/mac/BUILD.gn b/chromium/build/config/mac/BUILD.gn
index de8233bba4a..5369f767267 100644
--- a/chromium/build/config/mac/BUILD.gn
+++ b/chromium/build/config/mac/BUILD.gn
@@ -24,6 +24,13 @@ config("compiler") {
       "-arch",
       "i386",
     ]
+  } else if (current_cpu == "arm64") {
+    common_mac_flags += [
+      "-arch",
+      current_cpu,
+    ]
+  } else {
+    assert(false, "unknown current_cpu $current_cpu")
   }
 
   # This is here so that all files get recompiled after an Xcode update.
diff --git a/chromium/build/config/mac/OWNERS b/chromium/build/config/mac/OWNERS
index 14747a00255..0ed2e154d83 100644
--- a/chromium/build/config/mac/OWNERS
+++ b/chromium/build/config/mac/OWNERS
@@ -1,4 +1,2 @@
 rsesek@chromium.org
 sdefresne@chromium.org
-
-# COMPONENT: Build
diff --git a/chromium/build/config/mac/mac_sdk.gni b/chromium/build/config/mac/mac_sdk.gni
index c43c00ddaf0..eda9dfd77d8 100644
--- a/chromium/build/config/mac/mac_sdk.gni
+++ b/chromium/build/config/mac/mac_sdk.gni
@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/config/chrome_build.gni")
+import("//build/config/gclient_args.gni")
 import("//build/config/mac/mac_sdk_overrides.gni")
 import("//build/toolchain/goma.gni")
 import("//build/toolchain/toolchain.gni")
@@ -112,7 +113,13 @@ if (use_system_xcode) {
     mac_bin_path = find_sdk_lines[1]
   }
 } else {
-  mac_sdk_version = mac_sdk_official_version
+  if (mac_xcode_version == "default") {
+    mac_sdk_version = mac_sdk_official_version
+  } else if (mac_xcode_version == "xcode_12_beta") {
+    mac_sdk_version = "11.0"
+  } else {
+    assert(false, "unknown mac_xcode_version $mac_xcode_version")
+  }
   _dev = _hermetic_xcode_path + "/Contents/Developer"
   _sdk = "MacOSX${mac_sdk_version}.sdk"
   mac_sdk_path = _dev + "/Platforms/MacOSX.platform/Developer/SDKs/$_sdk"
diff --git a/chromium/build/config/mac/prepare_framework_version.py b/chromium/build/config/mac/prepare_framework_version.py
index 5e8a53f20ab..db921506987 100644
--- a/chromium/build/config/mac/prepare_framework_version.py
+++ b/chromium/build/config/mac/prepare_framework_version.py
@@ -31,7 +31,7 @@ def PrepareFrameworkVersion(version_file, framework_root_dir, version):
   # directory exists.
   dirname = os.path.dirname(version_file)
   if not os.path.isdir(dirname):
-    os.makedirs(dirname, 0700)
+    os.makedirs(dirname, 0o700)
 
   with open(version_file, 'w+') as f:
     f.write(version)
diff --git a/chromium/build/config/mac/sdk_info.py b/chromium/build/config/mac/sdk_info.py
index 805097a2339..1ad11d3b195 100644
--- a/chromium/build/config/mac/sdk_info.py
+++ b/chromium/build/config/mac/sdk_info.py
@@ -69,8 +69,8 @@ def FillXcodeVersion(settings, developer_dir):
 
 def FillMachineOSBuild(settings):
   """Fills OS build number into |settings|."""
-  machine_os_build = subprocess.check_output(['sw_vers',
-                                              '-buildVersion']).strip()
+  machine_os_build = subprocess.check_output(['sw_vers', '-buildVersion'],
+                                             universal_newlines=True).strip()
   settings['machine_os_build'] = machine_os_build
 
   # The reported build number is made up from the kernel major version number,