Update to Chromium version 95.0.4638.0 (#920003)

Known issues:
- Windows ARM64 builds are currently failing due to
  https://crbug.com/1242884#c31
This commit is contained in:
Marshall Greenblatt
2021-09-20 12:06:23 +03:00
parent 0a10fd4506
commit 5782fdca16
88 changed files with 597 additions and 645 deletions

View File

@ -1,8 +1,8 @@
diff --git .gn .gn
index 64dbcb82086d9..2527fd74ed4b1 100644
index c89d504b288ba..3ae0eb3905db1 100644
--- .gn
+++ .gn
@@ -144,6 +144,8 @@ exec_script_whitelist =
@@ -145,6 +145,8 @@ exec_script_whitelist =
"//chrome/android/webapk/shell_apk/prepare_upload_dir/BUILD.gn",
@ -12,7 +12,7 @@ index 64dbcb82086d9..2527fd74ed4b1 100644
# https://crbug.com/474506.
"//clank/java/BUILD.gn",
diff --git BUILD.gn BUILD.gn
index 3bb7c2579c19c..8562b4bb02806 100644
index 0624ab1a07c89..030c497f8e2a2 100644
--- BUILD.gn
+++ BUILD.gn
@@ -16,6 +16,7 @@ import("//build/config/sanitizers/sanitizers.gni")
@ -23,7 +23,7 @@ index 3bb7c2579c19c..8562b4bb02806 100644
import("//chrome/browser/buildflags.gni")
import("//chrome/browser/media/router/features.gni")
import("//components/nacl/features.gni")
@@ -263,6 +264,9 @@ group("gn_all") {
@@ -265,6 +266,9 @@ group("gn_all") {
deps += [ "//chrome/test:telemetry_perf_unittests${_target_suffix}" ]
}
}
@ -79,7 +79,7 @@ index d2266b28b33f8..a7ff6d9b68f38 100644
+_OBJC_METACLASS_$_UnderlayOpenGLHostingWindow
+
diff --git chrome/chrome_paks.gni chrome/chrome_paks.gni
index b9dce47a02f58..70b11f9312fc8 100644
index a7056344778ec..322a3f313f63e 100644
--- chrome/chrome_paks.gni
+++ chrome/chrome_paks.gni
@@ -4,6 +4,7 @@
@ -152,18 +152,18 @@ index 51fa0d7f4cf77..2ede68e9377eb 100644
outputs = [
# See also chrome.packed.7z conditionally added below.
diff --git tools/grit/grit_defines.gni tools/grit/grit_defines.gni
index 0039f04a75ef2..32beb70d1b99c 100644
index 497bc384ee79f..85056a86edd2c 100644
--- tools/grit/grit_defines.gni
+++ tools/grit/grit_defines.gni
@@ -5,6 +5,7 @@
import("//build/config/chrome_build.gni")
@@ -6,6 +6,7 @@ import("//build/config/chrome_build.gni")
import("//build/config/chromeos/ui_mode.gni")
import("//build/config/crypto.gni")
import("//build/config/devtools.gni")
+import("//build/config/locales.gni")
import("//build/config/ui.gni")
grit_defines = [
@@ -111,6 +112,13 @@ if (is_android) {
shared_intermediate_dir = rebase_path(root_gen_dir, root_build_dir)
@@ -119,6 +120,13 @@ if (is_android) {
]
}