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

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

Issue 204023002: Turns on use_mojo=1 for windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reorder Created 6 years, 9 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
« no previous file with comments | « chrome/chrome.isolate ('k') | chrome/installer/mini_installer.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 { 1 {
2 'variables': { 2 'variables': {
3 'version_py': '<(DEPTH)/build/util/version.py', 3 'version_py': '<(DEPTH)/build/util/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 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 }], 216 }],
217 ['icu_use_data_file_flag == 0', { 217 ['icu_use_data_file_flag == 0', {
218 'inputs': [ 218 'inputs': [
219 '<(PRODUCT_DIR)/icudt.dll', 219 '<(PRODUCT_DIR)/icudt.dll',
220 ], 220 ],
221 }, { # else icu_use_data_file_flag != 0 221 }, { # else icu_use_data_file_flag != 0
222 'inputs': [ 222 'inputs': [
223 '<(PRODUCT_DIR)/icudtl.dat', 223 '<(PRODUCT_DIR)/icudtl.dat',
224 ], 224 ],
225 }], 225 }],
226 ['use_mojo==0', {
227 'inputs!': [
228 '<(PRODUCT_DIR)/mojo_system.dll',
229 ],
230 }],
226 ], 231 ],
227 'inputs': [ 232 'inputs': [
228 '<(create_installer_archive_py_path)', 233 '<(create_installer_archive_py_path)',
229 '<(PRODUCT_DIR)/chrome.exe', 234 '<(PRODUCT_DIR)/chrome.exe',
230 '<(PRODUCT_DIR)/chrome.dll', 235 '<(PRODUCT_DIR)/chrome.dll',
236 '<(PRODUCT_DIR)/mojo_system.dll',
231 '<(PRODUCT_DIR)/nacl64.exe', 237 '<(PRODUCT_DIR)/nacl64.exe',
232 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', 238 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
233 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', 239 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
234 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', 240 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
235 '<(PRODUCT_DIR)/locales/en-US.pak', 241 '<(PRODUCT_DIR)/locales/en-US.pak',
236 ], 242 ],
237 'outputs': [ 243 'outputs': [
238 # 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
239 # conditional above. 245 # conditional above.
240 'xxx2.out', 246 'xxx2.out',
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 'variables': { 314 'variables': {
309 'branding_dir': '../app/theme/google_chrome', 315 'branding_dir': '../app/theme/google_chrome',
310 }, 316 },
311 }, { # else branding!="Chrome" 317 }, { # else branding!="Chrome"
312 'variables': { 318 'variables': {
313 'branding_dir': '../app/theme/chromium', 319 'branding_dir': '../app/theme/chromium',
314 }, 320 },
315 }], 321 }],
316 ], 322 ],
317 } 323 }
OLDNEW
« no previous file with comments | « chrome/chrome.isolate ('k') | chrome/installer/mini_installer.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698