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

Side by Side Diff: build/all.gyp

Issue 314253003: Remove memory_watcher tool as well as --memory-profile command line flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix compile issue on non-ChromeOS platforms Created 6 years, 6 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
« no previous file with comments | « no previous file | chrome/app/chrome_main_delegate.cc » ('j') | 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 'variables': { 6 'variables': {
7 # A hook that can be overridden in other repositories to add additional 7 # A hook that can be overridden in other repositories to add additional
8 # compilation targets to 'All'. Only used on Android. 8 # compilation targets to 'All'. Only used on Android.
9 'android_app_targets%': [], 9 'android_app_targets%': [],
10 }, 10 },
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 '../tools/xdisplaycheck/xdisplaycheck.gyp:*', 157 '../tools/xdisplaycheck/xdisplaycheck.gyp:*',
158 ], 158 ],
159 }], 159 }],
160 ['OS=="win"', { 160 ['OS=="win"', {
161 'conditions': [ 161 'conditions': [
162 ['win_use_allocator_shim==1', { 162 ['win_use_allocator_shim==1', {
163 'dependencies': [ 163 'dependencies': [
164 '../base/allocator/allocator.gyp:*', 164 '../base/allocator/allocator.gyp:*',
165 ], 165 ],
166 }], 166 }],
167 # Don't enable dependencies that don't work on Win64.
168 ['target_arch!="x64"', {
169 'dependencies': [
170 # TODO(jschuh) Enable Win64 Memory Watcher. crbug.com/176877
171 '../tools/memory_watcher/memory_watcher.gyp:*',
172 ],
173 }],
174 ], 167 ],
175 'dependencies': [ 168 'dependencies': [
176 '../chrome_elf/chrome_elf.gyp:*', 169 '../chrome_elf/chrome_elf.gyp:*',
177 '../cloud_print/cloud_print.gyp:*', 170 '../cloud_print/cloud_print.gyp:*',
178 '../courgette/courgette.gyp:*', 171 '../courgette/courgette.gyp:*',
179 '../rlz/rlz.gyp:*', 172 '../rlz/rlz.gyp:*',
180 '../sandbox/sandbox.gyp:*', 173 '../sandbox/sandbox.gyp:*',
181 '<(angle_path)/src/build_angle.gyp:*', 174 '<(angle_path)/src/build_angle.gyp:*',
182 '../third_party/bspatch/bspatch.gyp:*', 175 '../third_party/bspatch/bspatch.gyp:*',
183 '../tools/win/static_initializers/static_initializers.gyp:*', 176 '../tools/win/static_initializers/static_initializers.gyp:*',
(...skipping 1056 matching lines...) Expand 10 before | Expand all | Expand 10 after
1240 'dependencies': [ 1233 'dependencies': [
1241 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', 1234 '../ui/views/examples/examples.gyp:views_examples_with_content_exe',
1242 '../ui/views/views.gyp:views', 1235 '../ui/views/views.gyp:views',
1243 '../ui/views/views.gyp:views_unittests', 1236 '../ui/views/views.gyp:views_unittests',
1244 ], 1237 ],
1245 }, # target_name: macviews_builder 1238 }, # target_name: macviews_builder
1246 ], # targets 1239 ], # targets
1247 }], # os=='mac' and toolkit_views==1 1240 }], # os=='mac' and toolkit_views==1
1248 ], # conditions 1241 ], # conditions
1249 } 1242 }
OLDNEW
« no previous file with comments | « no previous file | chrome/app/chrome_main_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698