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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome.gyp

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') | « build/all.gyp ('k') | chrome/chrome_installer.gypi » ('j') | chrome/chrome_installer.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome.gyp
===================================================================
--- chrome/chrome.gyp (revision 184179)
+++ chrome/chrome.gyp (working copy)
@@ -876,7 +876,7 @@
'../ui/ui.gyp:ui_unittests',
],
'conditions': [
- ['use_aura==1', {
+ ['use_aura==1 or target_arch=="x64"', {
'dependencies!': [
'../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
'../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
« build/all.gyp ('K') | « build/all.gyp ('k') | chrome/chrome_installer.gypi » ('j') | chrome/chrome_installer.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698