mirror of
				https://bitbucket.org/chromiumembedded/cef
				synced 2025-06-05 21:39:12 +02:00 
			
		
		
		
	Update to Chromium revision fc6aaca4 (#406441)
This commit is contained in:
		@@ -1,8 +1,8 @@
 | 
			
		||||
diff --git .gn .gn
 | 
			
		||||
index 29bfe8c..a1e2af6 100644
 | 
			
		||||
index 658f215..223e0f1 100644
 | 
			
		||||
--- .gn
 | 
			
		||||
+++ .gn
 | 
			
		||||
@@ -249,6 +249,8 @@ exec_script_whitelist = [
 | 
			
		||||
@@ -252,6 +252,8 @@ exec_script_whitelist = [
 | 
			
		||||
   "//build/toolchain/win/BUILD.gn",
 | 
			
		||||
   "//build/util/branding.gni",
 | 
			
		||||
   "//build/util/version.gni",
 | 
			
		||||
@@ -12,10 +12,10 @@ index 29bfe8c..a1e2af6 100644
 | 
			
		||||
   "//chrome/browser/BUILD.gn",
 | 
			
		||||
   "//chrome/browser/chromeos/BUILD.gn",
 | 
			
		||||
diff --git BUILD.gn BUILD.gn
 | 
			
		||||
index 23e67d9..c3d4ec6 100644
 | 
			
		||||
index 2bbc1eb..715fa70 100644
 | 
			
		||||
--- BUILD.gn
 | 
			
		||||
+++ BUILD.gn
 | 
			
		||||
@@ -259,6 +259,7 @@ group("both_gn_and_gyp") {
 | 
			
		||||
@@ -260,6 +260,7 @@ group("both_gn_and_gyp") {
 | 
			
		||||
     # and whether there should be other targets that are iOS-only and missing.
 | 
			
		||||
     deps += [
 | 
			
		||||
       "//cc:cc_unittests",
 | 
			
		||||
@@ -23,26 +23,6 @@ index 23e67d9..c3d4ec6 100644
 | 
			
		||||
       "//chrome/test:telemetry_perf_unittests",
 | 
			
		||||
       "//chrome/test:unit_tests",
 | 
			
		||||
       "//components:components_browsertests",
 | 
			
		||||
diff --git build/config/mac/base_rules.gni build/config/mac/base_rules.gni
 | 
			
		||||
index 109710d..d2c442e 100644
 | 
			
		||||
--- build/config/mac/base_rules.gni
 | 
			
		||||
+++ build/config/mac/base_rules.gni
 | 
			
		||||
@@ -366,13 +366,13 @@ template("compile_xibs") {
 | 
			
		||||
     script = "//build/config/mac/compile_xib.py"
 | 
			
		||||
     sources = invoker.sources
 | 
			
		||||
     outputs = [
 | 
			
		||||
-      "$target_gen_dir/{{source_name_part}}.nib",
 | 
			
		||||
+      "$target_gen_dir/$target_name/{{source_name_part}}.nib",
 | 
			
		||||
     ]
 | 
			
		||||
     args = [
 | 
			
		||||
              "--input",
 | 
			
		||||
              "{{source}}",
 | 
			
		||||
              "--output",
 | 
			
		||||
-             rebase_path("$target_gen_dir/{{source_name_part}}.nib"),
 | 
			
		||||
+             rebase_path("$target_gen_dir/$target_name/{{source_name_part}}.nib"),
 | 
			
		||||
            ] + ibtool_flags
 | 
			
		||||
   }
 | 
			
		||||
 }
 | 
			
		||||
diff --git build/config/win/visual_studio_version.gni build/config/win/visual_studio_version.gni
 | 
			
		||||
index 5bfa9a7..5e6e05d 100644
 | 
			
		||||
--- build/config/win/visual_studio_version.gni
 | 
			
		||||
@@ -100,10 +80,10 @@ index d58cb85..fd608ba 100644
 | 
			
		||||
 
 | 
			
		||||
 
 | 
			
		||||
diff --git chrome/BUILD.gn chrome/BUILD.gn
 | 
			
		||||
index 1c26c3f..556dd64 100644
 | 
			
		||||
index 70a1759..7822a80 100644
 | 
			
		||||
--- chrome/BUILD.gn
 | 
			
		||||
+++ chrome/BUILD.gn
 | 
			
		||||
@@ -651,7 +651,7 @@ if (is_win) {
 | 
			
		||||
@@ -686,7 +686,7 @@ if (is_win) {
 | 
			
		||||
     ]
 | 
			
		||||
 
 | 
			
		||||
     foreach(locale, locales_as_mac_outputs) {
 | 
			
		||||
@@ -113,23 +93,23 @@ index 1c26c3f..556dd64 100644
 | 
			
		||||
 
 | 
			
		||||
     outputs = [
 | 
			
		||||
diff --git chrome/chrome_repack_locales.gni chrome/chrome_repack_locales.gni
 | 
			
		||||
index 9601dd4..9a7734a 100644
 | 
			
		||||
index 54559c7..8ef1e66 100644
 | 
			
		||||
--- chrome/chrome_repack_locales.gni
 | 
			
		||||
+++ chrome/chrome_repack_locales.gni
 | 
			
		||||
@@ -161,9 +161,9 @@ template("chrome_repack_locales") {
 | 
			
		||||
 
 | 
			
		||||
       # Compute the output name. Mac uses a different location.
 | 
			
		||||
       if (is_mac || is_ios) {
 | 
			
		||||
@@ -192,9 +192,9 @@ template("chrome_repack_locales") {
 | 
			
		||||
       if (defined(invoker.output_dir)) {
 | 
			
		||||
         output = "${invoker.output_dir}/${output_locale}.pak"
 | 
			
		||||
       } else if (is_mac || is_ios) {
 | 
			
		||||
-        output = "${root_gen_dir}/repack/locales/${output_locale}.pak"
 | 
			
		||||
+        output = "${root_gen_dir}/chrome/repack/locales/${output_locale}.pak"
 | 
			
		||||
       } else {
 | 
			
		||||
-        output = "${root_out_dir}/locales/${output_locale}.pak"
 | 
			
		||||
+        output = "${root_out_dir}/chrome/locales/${output_locale}.pak"
 | 
			
		||||
       }
 | 
			
		||||
     }
 | 
			
		||||
 
 | 
			
		||||
       if (defined(invoker.additional_source_patterns)) {
 | 
			
		||||
diff --git chrome/installer/mini_installer/BUILD.gn chrome/installer/mini_installer/BUILD.gn
 | 
			
		||||
index 699f56f..e2659fc 100644
 | 
			
		||||
index 842a0b5..8814ec1 100644
 | 
			
		||||
--- chrome/installer/mini_installer/BUILD.gn
 | 
			
		||||
+++ chrome/installer/mini_installer/BUILD.gn
 | 
			
		||||
@@ -125,7 +125,7 @@ template("generate_mini_installer") {
 | 
			
		||||
@@ -141,23 +121,3 @@ index 699f56f..e2659fc 100644
 | 
			
		||||
       "$root_out_dir/setup.exe",
 | 
			
		||||
       release_file,
 | 
			
		||||
     ]
 | 
			
		||||
diff --git tools/grit/repack.gni tools/grit/repack.gni
 | 
			
		||||
index 42087f9..7dd1520 100644
 | 
			
		||||
--- tools/grit/repack.gni
 | 
			
		||||
+++ tools/grit/repack.gni
 | 
			
		||||
@@ -18,6 +18,7 @@ declare_args() {
 | 
			
		||||
 #       File name (single string) of the output file.
 | 
			
		||||
 #
 | 
			
		||||
 #   deps  [optional]
 | 
			
		||||
+#   public_deps  [optional]
 | 
			
		||||
 #   visibility  [optional]
 | 
			
		||||
 #       Normal meaning.
 | 
			
		||||
 template("repack") {
 | 
			
		||||
@@ -25,6 +26,7 @@ template("repack") {
 | 
			
		||||
     forward_variables_from(invoker,
 | 
			
		||||
                            [
 | 
			
		||||
                              "deps",
 | 
			
		||||
+                             "public_deps",
 | 
			
		||||
                              "testonly",
 | 
			
		||||
                              "visibility",
 | 
			
		||||
                            ])
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user