win: get tools/crashpad_database_util mostly working

tools/tools.gyp

Index: tools/tools.gyp
diff --git a/tools/tools.gyp b/tools/tools.gyp
index 2c4ad2ab34986201befbe3b12f6ccef6c490738f..49c170561b9471883b650d6c00404668cf09adbe 100644
--- a/tools/tools.gyp
+++ b/tools/tools.gyp
@@ -16,6 +16,39 @@
   'includes': [
     '../build/crashpad.gypi',
   ],
+  'targets': [
+    {
+      'target_name': 'crashpad_tool_support',
+      'type': 'static_library',
+      'dependencies': [
+        '../third_party/mini_chromium/mini_chromium.gyp:base',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'sources': [
+        'tool_support.cc',
+        'tool_support.h',
+      ],
+    },
+    {
+      'target_name': 'crashpad_database_util',
+      'type': 'executable',
+      'dependencies': [
+        'crashpad_tool_support',
+        '../client/client.gyp:crashpad_client',
+        '../compat/compat.gyp:crashpad_compat',
+        '../third_party/mini_chromium/mini_chromium.gyp:base',
+        '../util/util.gyp:crashpad_util',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'sources': [
+        'crashpad_database_util.cc',
+      ],
+    },
+  ],
   'conditions': [
     ['OS=="mac"', {
       'variables': {
@@ -46,37 +79,6 @@
 
       'targets': [
         {
-          'target_name': 'crashpad_tool_support',
-          'type': 'static_library',
-          'dependencies': [
-            '../third_party/mini_chromium/mini_chromium.gyp:base',
-          ],
-          'include_dirs': [
-            '..',
-          ],
-          'sources': [
-            'tool_support.cc',
-            'tool_support.h',
-          ],
-        },
-        {
-          'target_name': 'crashpad_database_util',
-          'type': 'executable',
-          'dependencies': [
-            'crashpad_tool_support',
-            '../client/client.gyp:crashpad_client',
-            '../compat/compat.gyp:crashpad_compat',
-            '../third_party/mini_chromium/mini_chromium.gyp:base',
-            '../util/util.gyp:crashpad_util',
-          ],
-          'include_dirs': [
-            '..',
-          ],
-          'sources': [
-            'crashpad_database_util.cc',
-          ],
-        },
-        {
           'target_name': 'catch_exception_tool',
           'type': 'executable',
           'dependencies': [
@@ -182,8 +184,6 @@
           ],
         },
       ],
-    }, {
-      'targets': [],
     }],
   ],
 }