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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'All', 8 'target_name': 'All',
9 'type': 'none', 9 'type': 'none',
10 'xcode_create_dependents_test_runner': 1, 10 'xcode_create_dependents_test_runner': 1,
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 '../tools/gtk_clipboard_dump/gtk_clipboard_dump.gyp:*', 118 '../tools/gtk_clipboard_dump/gtk_clipboard_dump.gyp:*',
119 ], 119 ],
120 }], 120 }],
121 ['OS=="win"', { 121 ['OS=="win"', {
122 'conditions': [ 122 'conditions': [
123 ['win_use_allocator_shim==1', { 123 ['win_use_allocator_shim==1', {
124 'dependencies': [ 124 'dependencies': [
125 '../base/allocator/allocator.gyp:*', 125 '../base/allocator/allocator.gyp:*',
126 ], 126 ],
127 }], 127 }],
128 # Don't enable dependencies that don't work on Win64.
129 ['target_arch!="x64"', {
130 'dependencies': [
131 # TODO(jschuh) Enable Win64 Memory Watcher. crbug.com/176877
132 '../tools/memory_watcher/memory_watcher.gyp:*',
133 ],
134 }],
128 ], 135 ],
129 'dependencies': [ 136 'dependencies': [
130 '../chrome_frame/chrome_frame.gyp:*', 137 '../chrome_frame/chrome_frame.gyp:*',
131 '../cloud_print/cloud_print.gyp:*', 138 '../cloud_print/cloud_print.gyp:*',
132 '../courgette/courgette.gyp:*', 139 '../courgette/courgette.gyp:*',
133 '../rlz/rlz.gyp:*', 140 '../rlz/rlz.gyp:*',
134 '../sandbox/sandbox.gyp:*', 141 '../sandbox/sandbox.gyp:*',
135 '../third_party/angle/src/build_angle.gyp:*', 142 '../third_party/angle/src/build_angle.gyp:*',
136 '../third_party/bsdiff/bsdiff.gyp:*', 143 '../third_party/bsdiff/bsdiff.gyp:*',
137 '../third_party/bspatch/bspatch.gyp:*', 144 '../third_party/bspatch/bspatch.gyp:*',
138 '../third_party/gles2_book/gles2_book.gyp:*', 145 '../third_party/gles2_book/gles2_book.gyp:*',
139 '../tools/memory_watcher/memory_watcher.gyp:*',
140 ], 146 ],
141 }, { 147 }, {
142 'dependencies': [ 148 'dependencies': [
143 '../third_party/libevent/libevent.gyp:*', 149 '../third_party/libevent/libevent.gyp:*',
144 ], 150 ],
145 }], 151 }],
146 ['toolkit_views==1', { 152 ['toolkit_views==1', {
147 'dependencies': [ 153 'dependencies': [
148 '../ui/views/controls/webview/webview.gyp:*', 154 '../ui/views/controls/webview/webview.gyp:*',
149 '../ui/views/views.gyp:*', 155 '../ui/views/views.gyp:*',
(...skipping 627 matching lines...) Expand 10 before | Expand all | Expand 10 after
777 '../chrome/chrome.gyp:browser_tests_run', 783 '../chrome/chrome.gyp:browser_tests_run',
778 '../chrome/chrome.gyp:sync_integration_tests_run', 784 '../chrome/chrome.gyp:sync_integration_tests_run',
779 '../chrome/chrome.gyp:unit_tests_run', 785 '../chrome/chrome.gyp:unit_tests_run',
780 '../net/net.gyp:net_unittests_run', 786 '../net/net.gyp:net_unittests_run',
781 ], 787 ],
782 }, # target_name: chromium_swarm_tests 788 }, # target_name: chromium_swarm_tests
783 ], 789 ],
784 }], 790 }],
785 ], # conditions 791 ], # conditions
786 } 792 }
OLDNEW
« 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