diff options
Diffstat (limited to 'base/allocator/allocator.gyp')
| -rw-r--r-- | base/allocator/allocator.gyp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp index a4a4edd..09ee3f9 100644 --- a/base/allocator/allocator.gyp +++ b/base/allocator/allocator.gyp @@ -57,7 +57,8 @@ '<(tcmalloc_dir)/src/base/basictypes.h', '<(tcmalloc_dir)/src/base/commandlineflags.h', '<(tcmalloc_dir)/src/base/cycleclock.h', - '<(tcmalloc_dir)/src/base/dynamic_annotations.cc', + # We don't list dynamic_annotations.cc since its copy is already + # present in the dynamic_annotations target. '<(tcmalloc_dir)/src/base/dynamic_annotations.h', '<(tcmalloc_dir)/src/base/elfcore.h', '<(tcmalloc_dir)/src/base/googleinit.h', @@ -242,6 +243,9 @@ '<(tcmalloc_dir)/src/windows/preamble_patcher.h', '<(tcmalloc_dir)/src/windows/preamble_patcher_with_stub.cc', ], + 'dependencies': [ + '../base.gyp:dynamic_annotations', + ], 'msvs_settings': { # TODO(sgk): merge this with build/common.gypi settings 'VCLibrarianTool=': { |