Move dynamic_annotations into a separate gyp file to break

base/base.gypi

Index: base/base.gypi
diff --git a/base/base.gypi b/base/base.gypi
index d529dab77d2e2170994fbe201b9a8e31818765d5..5300ca58bf1ab38e700cb2333939958fadd9065b 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -369,7 +369,7 @@
       },
       'dependencies': [
         '../third_party/modp_b64/modp_b64.gyp:modp_b64',
-        'dynamic_annotations',
+        'third_party/dynamic_annotations/dynamic_annotations.gyp: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
@@ -572,44 +572,11 @@
         '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',
@@ -617,7 +584,7 @@
             'base_target': 1,
           },
           'dependencies': [
-            'dynamic_annotations_win64',
+            'third_party/dynamic_annotations/dynamic_annotations.gyp: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