Update dynamic annotations and move them to base/third_party

base/allocator/allocator.gyp

 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'jemalloc_dir': '../../third_party/jemalloc/chromium',
     'tcmalloc_dir': '../../third_party/tcmalloc/chromium',
   },
   'targets': [
@@ skipping 39 matching lines @@
         '<(tcmalloc_dir)/src/addressmap-inl.h',
         '<(tcmalloc_dir)/src/base/atomicops-internals-linuxppc.h',
         '<(tcmalloc_dir)/src/base/atomicops-internals-macosx.h',
         '<(tcmalloc_dir)/src/base/atomicops-internals-x86-msvc.h',
         '<(tcmalloc_dir)/src/base/atomicops-internals-x86.cc',
         '<(tcmalloc_dir)/src/base/atomicops-internals-x86.h',
         '<(tcmalloc_dir)/src/base/atomicops.h',
         '<(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',
         '<(tcmalloc_dir)/src/base/linux_syscall_support.h',
         '<(tcmalloc_dir)/src/base/linuxthreads.cc',
         '<(tcmalloc_dir)/src/base/linuxthreads.h',
         '<(tcmalloc_dir)/src/base/logging.cc',
         '<(tcmalloc_dir)/src/base/logging.h',
         '<(tcmalloc_dir)/src/base/low_level_alloc.cc',
         '<(tcmalloc_dir)/src/base/low_level_alloc.h',
@@ skipping 164 matching lines @@
         '<(tcmalloc_dir)/src/windows/mingw.h',
         '<(tcmalloc_dir)/src/windows/mini_disassembler.cc',
         '<(tcmalloc_dir)/src/windows/mini_disassembler.h',
         '<(tcmalloc_dir)/src/windows/mini_disassembler_types.h',
         '<(tcmalloc_dir)/src/windows/override_functions.cc',
         '<(tcmalloc_dir)/src/windows/patch_functions.cc',
         '<(tcmalloc_dir)/src/windows/preamble_patcher.cc',
         '<(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=': {
           'AdditionalOptions': ['/ignore:4006,4221'],
           'AdditionalLibraryDirectories':
             ['<(DEPTH)/third_party/platformsdk_win7/files/Lib'],
         },
         'VCLinkerTool': {
           'AdditionalOptions': ['/ignore:4006'],
         },
@@ skipping 154 matching lines @@
       ],
     }],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: