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

Side by Side Diff: chrome/installer/mini_installer.gyp

Issue 11783036: Remove the SRPC IRT nexes from Chrome installers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 11 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 | Annotate | Revision Log
OLDNEW
1 { 1 {
2 'variables': { 2 'variables': {
3 'version_py': '../../chrome/tools/build/version.py', 3 'version_py': '../../chrome/tools/build/version.py',
4 'version_path': '../../chrome/VERSION', 4 'version_path': '../../chrome/VERSION',
5 'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE', 5 'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE',
6 # 'branding_dir' is set in the 'conditions' section at the bottom. 6 # 'branding_dir' is set in the 'conditions' section at the bottom.
7 'msvs_use_common_release': 0, 7 'msvs_use_common_release': 0,
8 'msvs_use_common_linker_extras': 0, 8 'msvs_use_common_linker_extras': 0,
9 'mini_installer_internal_deps%': 0, 9 'mini_installer_internal_deps%': 0,
10 'mini_installer_official_deps%': 0, 10 'mini_installer_official_deps%': 0,
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 'outputs': [ 218 'outputs': [
219 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).packed.7z', 219 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).packed.7z',
220 ], 220 ],
221 }], 221 }],
222 ['disable_nacl==1', { 222 ['disable_nacl==1', {
223 'inputs!': [ 223 'inputs!': [
224 '<(PRODUCT_DIR)/nacl64.exe', 224 '<(PRODUCT_DIR)/nacl64.exe',
225 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', 225 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
226 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', 226 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
227 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', 227 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
228 '<(PRODUCT_DIR)/nacl_irt_srpc_x86_32.nexe',
229 '<(PRODUCT_DIR)/nacl_irt_srpc_x86_64.nexe',
230 ], 228 ],
231 }], 229 }],
232 ], 230 ],
233 'inputs': [ 231 'inputs': [
234 '<(create_installer_archive_py_path)', 232 '<(create_installer_archive_py_path)',
235 '<(PRODUCT_DIR)/app_host.exe', 233 '<(PRODUCT_DIR)/app_host.exe',
236 '<(PRODUCT_DIR)/chrome.exe', 234 '<(PRODUCT_DIR)/chrome.exe',
237 '<(PRODUCT_DIR)/chrome.dll', 235 '<(PRODUCT_DIR)/chrome.dll',
238 '<(PRODUCT_DIR)/nacl64.exe', 236 '<(PRODUCT_DIR)/nacl64.exe',
239 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', 237 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
240 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', 238 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
241 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', 239 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
242 '<(PRODUCT_DIR)/nacl_irt_srpc_x86_32.nexe',
243 '<(PRODUCT_DIR)/nacl_irt_srpc_x86_64.nexe',
244 '<(PRODUCT_DIR)/locales/en-US.pak', 240 '<(PRODUCT_DIR)/locales/en-US.pak',
245 '<(PRODUCT_DIR)/icudt.dll', 241 '<(PRODUCT_DIR)/icudt.dll',
246 ], 242 ],
247 'outputs': [ 243 'outputs': [
248 # Also note that chrome.packed.7z is defined as an output in a 244 # Also note that chrome.packed.7z is defined as an output in a
249 # conditional above. 245 # conditional above.
250 'xxx2.out', 246 'xxx2.out',
251 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).7z', 247 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).7z',
252 '<(PRODUCT_DIR)/setup.ex_', 248 '<(PRODUCT_DIR)/setup.ex_',
253 '<(INTERMEDIATE_DIR)/packed_files.rc', 249 '<(INTERMEDIATE_DIR)/packed_files.rc',
(...skipping 27 matching lines...) Expand all
281 'variables': { 277 'variables': {
282 'branding_dir': '../app/theme/google_chrome', 278 'branding_dir': '../app/theme/google_chrome',
283 }, 279 },
284 }, { # else branding!="Chrome" 280 }, { # else branding!="Chrome"
285 'variables': { 281 'variables': {
286 'branding_dir': '../app/theme/chromium', 282 'branding_dir': '../app/theme/chromium',
287 }, 283 },
288 }], 284 }],
289 ], 285 ],
290 } 286 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698