Chromium Code Reviews| Index: chrome/installer/mini_installer/BUILD.gn |
| diff --git a/chrome/installer/mini_installer/BUILD.gn b/chrome/installer/mini_installer/BUILD.gn |
| index a5f9c71081dfc568542f1b0b62d6d8c55f048cf5..833edcf95c573853fdfc6627220706352b2ef75a 100644 |
| --- a/chrome/installer/mini_installer/BUILD.gn |
| +++ b/chrome/installer/mini_installer/BUILD.gn |
| @@ -99,10 +99,18 @@ group("setup_runtime_deps") { |
| # The output directory out_dir where the mini_installer image should be |
| # written. |
| # |
| +# chrome_dll_file (required) |
| +# The path to the version of chrome.dll that should be included in the |
| +# installer archive. |
| +# |
| +# chrome_dll_target (required) |
| +# The target that generated chrome_dll_file. |
| +# |
| # deps (required) |
| # Normal meaning. |
| template("generate_mini_installer") { |
| - custom_deps = invoker.deps |
| + chrome_dll_file = invoker.chrome_dll_file |
| + chrome_dll_target = invoker.chrome_dll_target |
| output_dir = invoker.out_dir |
| packed_files_rc_file = "$target_gen_dir/$target_name/packed_files.rc" |
| @@ -115,7 +123,7 @@ template("generate_mini_installer") { |
| release_file = "chrome.release" |
| inputs = [ |
| - "$output_dir/chrome.dll", |
| + "$chrome_dll_file", |
| "$root_out_dir/chrome.exe", |
| "$root_out_dir/locales/en-US.pak", |
| "$root_out_dir/setup.exe", |
| @@ -155,14 +163,15 @@ template("generate_mini_installer") { |
| #'--verbose', |
| ] |
| - deps = custom_deps + [ |
| - ":chrome_runtime_deps", |
| - ":setup_runtime_deps", |
| - "//chrome", |
| - "//chrome/browser/extensions/default_extensions", |
| - "//chrome/installer/setup", |
| - "//third_party/icu:icudata", |
| - ] |
| + deps = [ |
| + ":chrome_runtime_deps", |
| + ":setup_runtime_deps", |
| + "$chrome_dll_target", |
|
brettw
2016/06/28 20:32:22
Just write
chrome_dll_target,
(what you wrote do
|
| + "//chrome", |
| + "//chrome/browser/extensions/default_extensions", |
| + "//chrome/installer/setup", |
| + "//third_party/icu:icudata", |
| + ] |
| if (enable_hidpi) { |
| args += [ "--enable_hidpi=1" ] |
| @@ -249,17 +258,15 @@ template("generate_mini_installer") { |
| generate_mini_installer("mini_installer") { |
| out_dir = root_out_dir |
| - deps = [ |
| - "//chrome:main_dll", |
| - ] |
| + chrome_dll_file = "$root_out_dir/chrome.dll" |
| + chrome_dll_target = "//chrome:main_dll" |
| } |
| if (syzygy_optimize) { |
| generate_mini_installer("mini_installer_syzygy") { |
| out_dir = "$root_out_dir/syzygy/" |
| - deps = [ |
| - "//chrome/tools/build/win/syzygy:chrome_dll_syzygy", |
| - ] |
| + chrome_dll_file = "$root_out_dir/syzygy/chrome.dll" |
| + chrome_dll_target = "//chrome/tools/build/win/syzygy:chrome_dll_syzygy" |
| } |
| } |