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

Unified Diff: chrome/chrome_installer.gypi

Issue 12315062: Disable Chrome Frame in Win64 build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 10 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
« build/all.gyp ('K') | « chrome/chrome.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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',
« build/all.gyp ('K') | « chrome/chrome.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698