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

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
« no previous file with comments | « no previous file | chrome/tools/build/win/create_installer_archive.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 ":lib", 61 ":lib",
62 ] 62 ]
63 deps = [ 63 deps = [
64 "//base", 64 "//base",
65 "//testing/gtest", 65 "//testing/gtest",
66 ] 66 ]
67 } 67 }
68 68
69 packed_files_rc_file = "$target_gen_dir/packed_files.rc" 69 packed_files_rc_file = "$target_gen_dir/packed_files.rc"
70 70
71 # The runtime deps are used to tell create_installer_archive what component
72 # DLLs need to be packaged in a component build.
73 setup_runtime_deps = "$root_gen_dir/setup.runtime_deps"
74 chrome_runtime_deps = "$root_gen_dir/chrome_component.runtime_deps"
75
76 group("chrome_runtime_deps") {
77 write_runtime_deps = chrome_runtime_deps
78 data_deps = [
79 "//chrome",
80 "//chrome:main_dll",
81 "//chrome/browser/extensions/default_extensions",
82 "//chrome/installer/setup",
83 "//third_party/icu:icudata",
gab 2016/06/21 15:15:15 I think you should only need to depend on "chrome_
84 ]
85 }
86
87 group("setup_runtime_deps") {
88 write_runtime_deps = setup_runtime_deps
89 data_deps = [
90 "//chrome/installer/setup",
91 ]
92 }
93
71 action("archive") { 94 action("archive") {
72 script = "//chrome/tools/build/win/create_installer_archive.py" 95 script = "//chrome/tools/build/win/create_installer_archive.py"
73 96
74 release_file = "chrome.release" 97 release_file = "chrome.release"
75 98
76 inputs = [ 99 inputs = [
77 "$root_out_dir/chrome.exe", 100 "$root_out_dir/chrome.exe",
78 "$root_out_dir/chrome.dll", 101 "$root_out_dir/chrome.dll",
79 "$root_out_dir/locales/en-US.pak", 102 "$root_out_dir/locales/en-US.pak",
80 "$root_out_dir/setup.exe", 103 "$root_out_dir/setup.exe",
(...skipping 10 matching lines...) Expand all
91 "--build_dir", 114 "--build_dir",
92 rebase_path(root_out_dir, root_build_dir), 115 rebase_path(root_out_dir, root_build_dir),
93 "--staging_dir", 116 "--staging_dir",
94 rebase_path(root_gen_dir, root_build_dir), 117 rebase_path(root_gen_dir, root_build_dir),
95 "--input_file", 118 "--input_file",
96 rebase_path(release_file, root_build_dir), 119 rebase_path(release_file, root_build_dir),
97 "--resource_file_path", 120 "--resource_file_path",
98 rebase_path(packed_files_rc_file, root_build_dir), 121 rebase_path(packed_files_rc_file, root_build_dir),
99 "--target_arch=$current_cpu", 122 "--target_arch=$current_cpu",
100 "--distribution=_google_chrome", 123 "--distribution=_google_chrome",
124 "--component_runtime_deps",
125 rebase_path(chrome_runtime_deps, root_build_dir),
126 "--setup_runtime_deps",
127 rebase_path(setup_runtime_deps, root_build_dir),
101 128
102 # Optional arguments to generate diff installer. 129 # Optional arguments to generate diff installer.
103 #'--last_chrome_installer=C:/Temp/base', 130 #'--last_chrome_installer=C:/Temp/base',
104 #'--setup_exe_format=DIFF', 131 #'--setup_exe_format=DIFF',
105 #'--diff_algorithm=COURGETTE', 132 #'--diff_algorithm=COURGETTE',
106 133
107 # Optional argument for verbose archiving output. 134 # Optional argument for verbose archiving output.
108 #'--verbose', 135 #'--verbose',
109 ] 136 ]
110 137
111 deps = [ 138 deps = [
139 ":chrome_runtime_deps",
140 ":setup_runtime_deps",
112 "//chrome", 141 "//chrome",
113 "//chrome:main_dll", 142 "//chrome:main_dll",
114 "//chrome/browser/extensions/default_extensions", 143 "//chrome/browser/extensions/default_extensions",
115 "//chrome/installer/setup", 144 "//chrome/installer/setup",
116 "//third_party/icu:icudata", 145 "//third_party/icu:icudata",
117 ] 146 ]
118 147
119 if (enable_hidpi) { 148 if (enable_hidpi) {
120 args += [ "--enable_hidpi=1" ] 149 args += [ "--enable_hidpi=1" ]
121 } 150 }
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 args = [ 242 args = [
214 "--out", 243 "--out",
215 "$target_name.exe", 244 "$target_name.exe",
216 ] 245 ]
217 deps = [ 246 deps = [
218 ":mini_installer", 247 ":mini_installer",
219 "//chrome/installer/test:alternate_version_generator", 248 "//chrome/installer/test:alternate_version_generator",
220 ] 249 ]
221 } 250 }
222 } 251 }
OLDNEW
« 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