Update dynamic annotations and move them to base/third_party

base/base.gypi

 # Copyright (c) 2010 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.
 
 {
   'target_defaults': {
     'variables': {
       'base_target': 0,
     },
     'target_conditions': [
@@ skipping 46 matching lines @@
           'debug_on_start.cc',
           'debug_on_start.h',
           'debug_util.cc',
           'debug_util.h',
           'debug_util_mac.cc',
           'debug_util_posix.cc',
           'debug_util_win.cc',
           'dir_reader_fallback.h',
           'dir_reader_linux.h',
           'dir_reader_posix.h',
-          'dynamic_annotations.h',
-          'dynamic_annotations.cc',
           'env_var.cc',
           'env_var.h',
           'event_trace_consumer_win.h',
           'event_trace_controller_win.cc',
           'event_trace_controller_win.h',
           'event_trace_provider_win.cc',
           'event_trace_provider_win.h',
           'file_path.cc',
           'file_path.h',
           'file_util.cc',
@@ skipping 285 matching lines @@
   'targets': [
     {
       'target_name': 'base',
       'type': '<(library)',
       'msvs_guid': '1832A374-8A74-4F9E-B536-69A699B3E165',
       'variables': {
         'base_target': 1,
       },
       'dependencies': [
         '../third_party/modp_b64/modp_b64.gyp:modp_b64',
+        'dynamic_annotations',
       ],
       # TODO(gregoryd): direct_dependent_settings should be shared with the
       #  64-bit target, but it doesn't work due to a bug in gyp
       'direct_dependent_settings': {
         'include_dirs': [
           '..',
         ],
       },
       # Conditions that are not relevant for Win64 build
       'conditions': [
@@ skipping 182 matching lines @@
         'string16.h',
         'sync_socket.h',
         'sync_socket_win.cc',
         'sync_socket_posix.cc',
         'time_mac.cc',
         'time_posix.cc',
         'version.cc',
         'version.h',
       ],
     },
+    {
+      'target_name': 'dynamic_annotations',
+      'type': '<(library)',
+      'msvs_guid': 'EF3AD1A1-5FA6-4B70-9CCC-F5AE4C6D0892',
+      'include_dirs': [
+        '..',
+      ],
+      'sources': [
+        'third_party/dynamic_annotations/dynamic_annotations.c',
+        'third_party/dynamic_annotations/dynamic_annotations.h',
+      ],
+    },
   ],
   'conditions': [
     [ 'OS == "win"', {
       'targets': [
         {
+          'target_name': 'dynamic_annotations_win64',
+          'type': '<(library)',
+          'msvs_guid': 'E8055455-0065-427B-9461-34A16FAD1973',
+          # We can't use dynamic_annotations target for win64 build since it is
+          # a 32-bit library.
+          # TODO(gregoryd): merge with dynamic_annotations when
+          # the win32/64 targets are merged.
+          'include_dirs': [
+              '..',
+          ],
+          'sources': [
+            'third_party/dynamic_annotations/dynamic_annotations.c',
+            'third_party/dynamic_annotations/dynamic_annotations.h',
+          ],
+          'configurations': {
+            'Common_Base': {
+              'msvs_target_platform': 'x64',
+            },
+          },
+        },
+        {
           'target_name': 'base_nacl_win64',
           'type': '<(library)',
           'msvs_guid': 'CEE1F794-DC70-4FED-B7C4-4C12986672FE',
           'variables': {
             'base_target': 1,
           },
+          'dependencies': [
+            'dynamic_annotations_win64',
+          ],
           # TODO(gregoryd): direct_dependent_settings should be shared with the
           # 32-bit target, but it doesn't work due to a bug in gyp
           'direct_dependent_settings': {
             'include_dirs': [
               '..',
             ],
           },
           'defines': [
             '<@(nacl_win64_defines)',
           ],
@@ skipping 60 matching lines @@
             'third_party/xdg_mime/xdgmimemagic.c',
             'third_party/xdg_mime/xdgmimemagic.h',
             'third_party/xdg_mime/xdgmimeparent.c',
             'third_party/xdg_mime/xdgmimeparent.h',
           ],
         },
       ],
     }],
   ],
 }