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

Side by Side Diff: chrome/installer/mini_installer/BUILD.gn

Issue 2075863003: Use runtime_deps to tell create_installer_archive what dlls to copy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 unified diff | Download patch
OLDNEW
1 # Copyright 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/features.gni") 5 import("//build/config/features.gni")
6 import("//build/config/ui.gni") 6 import("//build/config/ui.gni")
7 import("//build_overrides/v8.gni") 7 import("//build_overrides/v8.gni")
8 import("//chrome/version.gni") 8 import("//chrome/version.gni")
9 import("//third_party/icu/config.gni") 9 import("//third_party/icu/config.gni")
10 import("//ui/base/ui_features.gni") 10 import("//ui/base/ui_features.gni")
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 release_file = "chrome.release" 74 release_file = "chrome.release"
75 75
76 inputs = [ 76 inputs = [
77 "$root_out_dir/chrome.exe", 77 "$root_out_dir/chrome.exe",
78 "$root_out_dir/chrome.dll", 78 "$root_out_dir/chrome.dll",
79 "$root_out_dir/locales/en-US.pak", 79 "$root_out_dir/locales/en-US.pak",
80 "$root_out_dir/setup.exe", 80 "$root_out_dir/setup.exe",
81 release_file, 81 release_file,
82 ] 82 ]
83 83
84 # The runtime deps are used to tell create_installer_archive what component
85 # build DLLs need to be packaged.
86 _installer_runtime_deps = "$root_gen_dir/mini_installer.runtime_deps"
87
84 outputs = [ 88 outputs = [
85 # See also chrome.packed.7z conditionally added below. 89 # See also chrome.packed.7z conditionally added below.
86 "$root_out_dir/chrome.7z", 90 "$root_out_dir/chrome.7z",
87 "$root_out_dir/setup.ex_", 91 "$root_out_dir/setup.ex_",
88 packed_files_rc_file, 92 packed_files_rc_file,
89 ] 93 ]
90 args = [ 94 args = [
91 "--build_dir", 95 "--build_dir",
92 rebase_path(root_out_dir, root_build_dir), 96 rebase_path(root_out_dir, root_build_dir),
93 "--staging_dir", 97 "--staging_dir",
94 rebase_path(root_gen_dir, root_build_dir), 98 rebase_path(root_gen_dir, root_build_dir),
95 "--input_file", 99 "--input_file",
96 rebase_path(release_file, root_build_dir), 100 rebase_path(release_file, root_build_dir),
97 "--resource_file_path", 101 "--resource_file_path",
98 rebase_path(packed_files_rc_file, root_build_dir), 102 rebase_path(packed_files_rc_file, root_build_dir),
99 "--target_arch=$current_cpu", 103 "--target_arch=$current_cpu",
100 "--distribution=_google_chrome", 104 "--distribution=_google_chrome",
105 "--runtime_deps",
106 rebase_path(_installer_runtime_deps, root_build_dir),
101 107
102 # Optional arguments to generate diff installer. 108 # Optional arguments to generate diff installer.
103 #'--last_chrome_installer=C:/Temp/base', 109 #'--last_chrome_installer=C:/Temp/base',
104 #'--setup_exe_format=DIFF', 110 #'--setup_exe_format=DIFF',
105 #'--diff_algorithm=COURGETTE', 111 #'--diff_algorithm=COURGETTE',
106 112
107 # Optional argument for verbose archiving output. 113 # Optional argument for verbose archiving output.
108 #'--verbose', 114 #'--verbose',
109 ] 115 ]
110 116
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 } 150 }
145 151
146 if (v8_use_external_startup_data) { 152 if (v8_use_external_startup_data) {
147 inputs += [ 153 inputs += [
148 "$root_out_dir/natives_blob.bin", 154 "$root_out_dir/natives_blob.bin",
149 "$root_out_dir/snapshot_blob.bin", 155 "$root_out_dir/snapshot_blob.bin",
150 ] 156 ]
151 deps += [ "//v8" ] 157 deps += [ "//v8" ]
152 } 158 }
153 159
160 write_runtime_deps = _installer_runtime_deps
161
154 depfile = "$target_gen_dir/archive.d" 162 depfile = "$target_gen_dir/archive.d"
155 args += [ 163 args += [
156 "--depfile", 164 "--depfile",
157 rebase_path(depfile, root_build_dir), 165 rebase_path(depfile, root_build_dir),
158 ] 166 ]
159 } 167 }
160 168
161 executable("mini_installer") { 169 executable("mini_installer") {
162 sources = [ 170 sources = [
163 "mini_installer.cc", 171 "mini_installer.cc",
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 args = [ 221 args = [
214 "--out", 222 "--out",
215 "$target_name.exe", 223 "$target_name.exe",
216 ] 224 ]
217 deps = [ 225 deps = [
218 ":mini_installer", 226 ":mini_installer",
219 "//chrome/installer/test:alternate_version_generator", 227 "//chrome/installer/test:alternate_version_generator",
220 ] 228 ]
221 } 229 }
222 } 230 }
OLDNEW
« no previous file with comments | « no previous file | chrome/tools/build/win/create_installer_archive.py » ('j') | chrome/tools/build/win/create_installer_archive.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698