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

Unified Diff: build/all.gyp

Issue 12317006: Disable memory_watcher on 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/all.gyp
===================================================================
--- build/all.gyp (revision 183415)
+++ build/all.gyp (working copy)
@@ -125,6 +125,13 @@
'../base/allocator/allocator.gyp:*',
],
}],
+ # Don't enable dependencies that don't work on Win64.
+ ['target_arch!="x64"', {
+ 'dependencies': [
+ # TODO(jschuh) Enable Win64 Memory Watcher. crbug.com/176877
+ '../tools/memory_watcher/memory_watcher.gyp:*',
+ ],
+ }],
],
'dependencies': [
'../chrome_frame/chrome_frame.gyp:*',
@@ -136,7 +143,6 @@
'../third_party/bsdiff/bsdiff.gyp:*',
'../third_party/bspatch/bspatch.gyp:*',
'../third_party/gles2_book/gles2_book.gyp:*',
- '../tools/memory_watcher/memory_watcher.gyp:*',
],
}, {
'dependencies': [
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698