| diff --git .gn .gn |
| index c7296bb80f62..a64c7c42720a 100644 |
| --- .gn |
| +++ .gn |
| @@ -642,6 +642,8 @@ exec_script_whitelist = |
| |
| "//chrome/android/webapk/shell_apk/prepare_upload_dir/BUILD.gn", |
| |
| + "//cef/BUILD.gn", |
| + |
| # TODO(dgn): Layer violation but breaks the build otherwise, see |
| # https://crbug.com/474506. |
| "//clank/java/BUILD.gn", |
| diff --git BUILD.gn BUILD.gn |
| index ad58fc03312a..856991ba6096 100644 |
| --- BUILD.gn |
| +++ BUILD.gn |
| @@ -222,6 +222,7 @@ group("gn_all") { |
| |
| if (!is_ios && !is_fuchsia) { |
| deps += [ |
| + "//cef", |
| "//chrome/test:telemetry_perf_unittests", |
| "//chrome/test:unit_tests", |
| "//components:components_browsertests", |
| diff --git build/config/win/visual_studio_version.gni build/config/win/visual_studio_version.gni |
| index 982fbe8d3f0d..e757be4688f1 100644 |
| --- build/config/win/visual_studio_version.gni |
| +++ build/config/win/visual_studio_version.gni |
| @@ -12,9 +12,8 @@ declare_args() { |
| # Currently always "2015". |
| visual_studio_version = "" |
| |
| - # Directory of the Windows driver kit. If visual_studio_path is empty, this |
| - # will be auto-filled. |
| - wdk_path = "" |
| + # Path to Visual Studio runtime libraries. |
| + visual_studio_runtime_dirs = "" |
| |
| # Full path to the Windows SDK, not including a backslash at the end. |
| # This value is the default location, override if you have a different |
| @@ -28,12 +27,11 @@ if (visual_studio_path == "") { |
| visual_studio_path = toolchain_data.vs_path |
| windows_sdk_path = toolchain_data.sdk_path |
| visual_studio_version = toolchain_data.vs_version |
| - wdk_path = toolchain_data.wdk_dir |
| visual_studio_runtime_dirs = toolchain_data.runtime_dirs |
| } else { |
| assert(visual_studio_version != "", |
| "You must set the visual_studio_version if you set the path") |
| - assert(wdk_path != "", |
| - "You must set the wdk_path if you set the visual studio path") |
| - visual_studio_runtime_dirs = [] |
| + assert(visual_studio_runtime_dirs != "", |
| + "You must set the visual_studio_runtime_dirs if you set the visual " + |
| + "studio path") |
| } |
| diff --git chrome/chrome_paks.gni chrome/chrome_paks.gni |
| index ddfc4bd551d1..0e9157969deb 100644 |
| --- chrome/chrome_paks.gni |
| +++ chrome/chrome_paks.gni |
| @@ -297,7 +297,7 @@ template("chrome_paks") { |
| } |
| |
| input_locales = locales |
| - output_dir = "${invoker.output_dir}/locales" |
| + output_dir = "${invoker.output_dir}/chrome/locales" |
| |
| if (is_mac) { |
| output_locales = locales_as_mac_outputs |
| diff --git chrome/installer/mini_installer/BUILD.gn chrome/installer/mini_installer/BUILD.gn |
| index b2c99d4721dd..c8f870fa4a06 100644 |
| --- chrome/installer/mini_installer/BUILD.gn |
| +++ chrome/installer/mini_installer/BUILD.gn |
| @@ -134,7 +134,7 @@ template("generate_mini_installer") { |
| inputs = [ |
| "$chrome_dll_file", |
| "$root_out_dir/chrome.exe", |
| - "$root_out_dir/locales/en-US.pak", |
| + "$root_out_dir/chrome/locales/en-US.pak", |
| "$root_out_dir/setup.exe", |
| "//chrome/tools/build/win/makecab.py", |
| release_file, |