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..a3bad610deb2fb095a3a308b0b3edd5458100a46 100644
--- a/tools/tools.gyp
+++ b/tools/tools.gyp
@@ -46,37 +46,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': [
@@ -183,7 +152,39 @@
         },
       ],
     }, {
-      'targets': [],
+      'targets': [

[Mark Mentovai, 2015/05/04 21:04:30]

Now this is in an else block that’s live on non-Mac, but we want it to be live
all the time. Let’s put a top-level 'targets' above the 'conditions' for this.

[scottmg, 2015/05/04 23:26:36]

Oh, geez, oops. Done.

+        {
+          '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',
+          ],
+        },
+      ],
     }],
   ],
 }