Index: chrome/chrome_installer.gypi |
=================================================================== |
--- chrome/chrome_installer.gypi (revision 184179) |
+++ chrome/chrome_installer.gypi (working copy) |
@@ -291,6 +291,8 @@ |
'AdditionalManifestFiles': '$(ProjectDir)\\installer\\setup\\setup.exe.manifest', |
}, |
}, |
+ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
+ 'msvs_disabled_warnings': [ 4267, ], |
robertshield
2013/02/25 00:37:36
Please update the CL description to include this,
jschuh
2013/02/25 01:10:02
Oh. This must have been sitting as a local change
|
'rules': [ |
{ |
'rule_name': 'setup_version', |
@@ -372,7 +374,7 @@ |
'branding_dir_100': 'app/theme/default_100_percent/chromium', |
}, |
}], |
- ['use_aura==1', { |
+ ['use_aura==1 or target_arch=="x64"', { |
'dependencies!': [ |
'../chrome_frame/chrome_frame.gyp:chrome_tab_idl', |
'../chrome_frame/chrome_frame.gyp:npchrome_frame', |