mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 80.0.3987.0 (#722274)
This commit is contained in:
committed by
Marshall Greenblatt
parent
ed39922f85
commit
71768ea6c3
@@ -1,8 +1,8 @@
|
||||
diff --git .gn .gn
|
||||
index 20f2aad03c82..8cc64748b027 100644
|
||||
index 62f3a6199ac3..fb0eb9b4b6ca 100644
|
||||
--- .gn
|
||||
+++ .gn
|
||||
@@ -654,6 +654,8 @@ exec_script_whitelist =
|
||||
@@ -649,6 +649,8 @@ exec_script_whitelist =
|
||||
|
||||
"//chrome/android/webapk/shell_apk/prepare_upload_dir/BUILD.gn",
|
||||
|
||||
@@ -12,10 +12,10 @@ index 20f2aad03c82..8cc64748b027 100644
|
||||
# https://crbug.com/474506.
|
||||
"//clank/java/BUILD.gn",
|
||||
diff --git BUILD.gn BUILD.gn
|
||||
index b2d4f2f591e9..a19e53cfd6a9 100644
|
||||
index efaf5b31ee37..2d9abf7a5e96 100644
|
||||
--- BUILD.gn
|
||||
+++ BUILD.gn
|
||||
@@ -211,6 +211,7 @@ group("gn_all") {
|
||||
@@ -213,6 +213,7 @@ group("gn_all") {
|
||||
|
||||
if (!is_ios && !is_fuchsia) {
|
||||
deps += [
|
||||
@@ -56,7 +56,7 @@ index 982fbe8d3f0d..e757be4688f1 100644
|
||||
+ "studio path")
|
||||
}
|
||||
diff --git build/toolchain/win/setup_toolchain.py build/toolchain/win/setup_toolchain.py
|
||||
index 9ee69df7d210..00ad4b3be81a 100644
|
||||
index 53fac69229a2..4eacf06265d1 100644
|
||||
--- build/toolchain/win/setup_toolchain.py
|
||||
+++ build/toolchain/win/setup_toolchain.py
|
||||
@@ -142,22 +142,25 @@ def _LoadToolchainEnv(cpu, sdk_dir, target_store):
|
||||
@@ -100,10 +100,10 @@ index 9ee69df7d210..00ad4b3be81a 100644
|
||||
|
||||
|
||||
diff --git build/vs_toolchain.py build/vs_toolchain.py
|
||||
index c3503cc47630..cdf5ec0dc95b 100755
|
||||
index 2101755c6694..4410ece82aa2 100755
|
||||
--- build/vs_toolchain.py
|
||||
+++ build/vs_toolchain.py
|
||||
@@ -86,11 +86,18 @@ def SetEnvironmentAndGetRuntimeDllDirs():
|
||||
@@ -90,11 +90,18 @@ def SetEnvironmentAndGetRuntimeDllDirs():
|
||||
runtime_path = os.path.pathsep.join(vs_runtime_dll_dirs)
|
||||
os.environ['PATH'] = runtime_path + os.path.pathsep + os.environ['PATH']
|
||||
elif sys.platform == 'win32' and not depot_tools_win_toolchain:
|
||||
@@ -123,10 +123,10 @@ index c3503cc47630..cdf5ec0dc95b 100755
|
||||
# directory in order to run binaries locally, but they are needed in order
|
||||
# to create isolates or the mini_installer. Copying them to the output
|
||||
diff --git chrome/chrome_paks.gni chrome/chrome_paks.gni
|
||||
index f4faf8c2eeb3..687c50622259 100644
|
||||
index 6469473e6a79..f9f630bfe0df 100644
|
||||
--- chrome/chrome_paks.gni
|
||||
+++ chrome/chrome_paks.gni
|
||||
@@ -275,7 +275,7 @@ template("chrome_paks") {
|
||||
@@ -284,7 +284,7 @@ template("chrome_paks") {
|
||||
}
|
||||
|
||||
input_locales = locales
|
||||
@@ -136,10 +136,10 @@ index f4faf8c2eeb3..687c50622259 100644
|
||||
if (is_mac) {
|
||||
output_locales = locales_as_mac_outputs
|
||||
diff --git chrome/installer/mini_installer/BUILD.gn chrome/installer/mini_installer/BUILD.gn
|
||||
index 99a1bc7cb24f..32ca34ac39b7 100644
|
||||
index bebec015f85d..cf4151a0f23e 100644
|
||||
--- chrome/installer/mini_installer/BUILD.gn
|
||||
+++ chrome/installer/mini_installer/BUILD.gn
|
||||
@@ -138,7 +138,7 @@ template("generate_mini_installer") {
|
||||
@@ -140,7 +140,7 @@ template("generate_mini_installer") {
|
||||
inputs = [
|
||||
"$chrome_dll_file",
|
||||
"$root_out_dir/chrome.exe",
|
||||
|
Reference in New Issue
Block a user