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

Unified Diff: chrome/installer/mini_installer.gypi

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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/installer/mini_installer.gyp ('k') | chrome/installer/mini_installer/chrome.release » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/mini_installer.gypi
diff --git a/chrome/installer/mini_installer.gypi b/chrome/installer/mini_installer.gypi
index ef0ccf494892c6c8cef52679c8a35a83a8265d7a..d3375fd47219763c8d5e197cb887f473e27aacd3 100644
--- a/chrome/installer/mini_installer.gypi
+++ b/chrome/installer/mini_installer.gypi
@@ -185,11 +185,17 @@
'<(PRODUCT_DIR)/icudtl.dat',
],
}],
+ ['use_mojo==0', {
+ 'inputs!': [
+ '<(PRODUCT_DIR)/mojo_system.dll',
+ ],
+ }],
],
'inputs': [
'<(create_installer_archive_py_path)',
'<(PRODUCT_DIR)/chrome.exe',
'<@(chrome_dll_path)',
+ '<(PRODUCT_DIR)/mojo_system.dll',
'<(PRODUCT_DIR)/nacl64.exe',
'<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
'<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
« no previous file with comments | « chrome/installer/mini_installer.gyp ('k') | chrome/installer/mini_installer/chrome.release » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698