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

Side by Side Diff: base/allocator/allocator.gyp

Issue 2108016: Move dynamic_annotations into a separate gyp file to break (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 years, 7 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 | base/base.gypi » ('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) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 'jemalloc_dir': '../../third_party/jemalloc/chromium', 7 'jemalloc_dir': '../../third_party/jemalloc/chromium',
8 'tcmalloc_dir': '../../third_party/tcmalloc/chromium', 8 'tcmalloc_dir': '../../third_party/tcmalloc/chromium',
9 }, 9 },
10 'targets': [ 10 'targets': [
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 '<(tcmalloc_dir)/src/windows/mini_disassembler.cc', 237 '<(tcmalloc_dir)/src/windows/mini_disassembler.cc',
238 '<(tcmalloc_dir)/src/windows/mini_disassembler.h', 238 '<(tcmalloc_dir)/src/windows/mini_disassembler.h',
239 '<(tcmalloc_dir)/src/windows/mini_disassembler_types.h', 239 '<(tcmalloc_dir)/src/windows/mini_disassembler_types.h',
240 '<(tcmalloc_dir)/src/windows/override_functions.cc', 240 '<(tcmalloc_dir)/src/windows/override_functions.cc',
241 '<(tcmalloc_dir)/src/windows/patch_functions.cc', 241 '<(tcmalloc_dir)/src/windows/patch_functions.cc',
242 '<(tcmalloc_dir)/src/windows/preamble_patcher.cc', 242 '<(tcmalloc_dir)/src/windows/preamble_patcher.cc',
243 '<(tcmalloc_dir)/src/windows/preamble_patcher.h', 243 '<(tcmalloc_dir)/src/windows/preamble_patcher.h',
244 '<(tcmalloc_dir)/src/windows/preamble_patcher_with_stub.cc', 244 '<(tcmalloc_dir)/src/windows/preamble_patcher_with_stub.cc',
245 ], 245 ],
246 'dependencies': [ 246 'dependencies': [
247 '../base.gyp:dynamic_annotations', 247 '../third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_anno tations',
248 ], 248 ],
249 'msvs_settings': { 249 'msvs_settings': {
250 # TODO(sgk): merge this with build/common.gypi settings 250 # TODO(sgk): merge this with build/common.gypi settings
251 'VCLibrarianTool=': { 251 'VCLibrarianTool=': {
252 'AdditionalOptions': ['/ignore:4006,4221'], 252 'AdditionalOptions': ['/ignore:4006,4221'],
253 'AdditionalLibraryDirectories': 253 'AdditionalLibraryDirectories':
254 ['<(DEPTH)/third_party/platformsdk_win7/files/Lib'], 254 ['<(DEPTH)/third_party/platformsdk_win7/files/Lib'],
255 }, 255 },
256 'VCLinkerTool': { 256 'VCLinkerTool': {
257 'AdditionalOptions': ['/ignore:4006'], 257 'AdditionalOptions': ['/ignore:4006'],
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
413 ], 413 ],
414 }], 414 }],
415 ], 415 ],
416 } 416 }
417 417
418 # Local Variables: 418 # Local Variables:
419 # tab-width:2 419 # tab-width:2
420 # indent-tabs-mode:nil 420 # indent-tabs-mode:nil
421 # End: 421 # End:
422 # vim: set expandtab tabstop=2 shiftwidth=2: 422 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | base/base.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698