Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8692)

Unified Diff: chrome/installer/mini_installer/BUILD.gn

Issue 2106563002: Fix the GN mini_installer_syzygy target. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nit Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/tools/build/win/create_installer_archive.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..699f56f537d7da11adee462992b687c8a452112f 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",
+ "//chrome/browser/extensions/default_extensions",
+ "//chrome/installer/setup",
+ "//third_party/icu:icudata",
+ chrome_dll_target,
+ ]
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"
}
}
« no previous file with comments | « no previous file | chrome/tools/build/win/create_installer_archive.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698