Merge from Chromium at DEPS revision 278205

This commit was generated by merge_to_master.py.

Change-Id: I23f1e7ea8c154ba72e7fb594436216f861f868ab

1 files changed, 68 insertions, 30 deletions

diff --git a/components/breakpad.gypi b/components/breakpad.gypi
index 9dcf912411..b981e3052e 100644
--- a/components/breakpad.gypi
+++ b/components/breakpad.gypi
@@ -3,42 +3,54 @@
 # found in the LICENSE file.
 
 {
-  'target_defaults': {
-    'variables': {
-      'breakpad_component_target': 0,
-    },
-    'target_conditions': [
-      ['breakpad_component_target==1', {
-        'defines': ['BREAKPAD_IMPLEMENTATION'],
-        'sources': [
-          'breakpad/app/breakpad_client.cc',
-          'breakpad/app/breakpad_client.h',
-          'breakpad/app/breakpad_linux.cc',
-          'breakpad/app/breakpad_linux.h',
-          'breakpad/app/breakpad_linux_impl.h',
-          'breakpad/app/breakpad_mac.h',
-          'breakpad/app/breakpad_mac.mm',
-          'breakpad/app/breakpad_win.cc',
-          'breakpad/app/breakpad_win.h',
-          'breakpad/app/hard_error_handler_win.cc',
-          'breakpad/app/hard_error_handler_win.h',
-        ],
-      }],
-    ],
-  },
   'targets': [
     {
+      'target_name': 'breakpad_component_lib',
+      'type': 'static_library',
+      'sources': [
+        'breakpad/app/breakpad_client.cc',
+        'breakpad/app/breakpad_client.h',
+        'breakpad/app/crash_keys_win.cc',
+        'breakpad/app/crash_keys_win.h',
+      ],
+      'include_dirs': [
+        '..',
+        '../breakpad/src',
+      ],
+    },
+    {
+      'variables': {
+        'conditions': [
+          ['OS == "ios" ', {
+            # On IOS there are no files compiled into the library, and we
+            # can't have libraries with zero objects.
+            'breakpad_component_target_type%': 'none',
+          }, {
+            'breakpad_component_target_type%': 'static_library',
+          }],
+        ],
+      },
       # Note: if you depend on this target, you need to either link in
       # content.gyp:content_common, or add
       # content/public/common/content_switches.cc to your sources.
       'target_name': 'breakpad_component',
-      'type': 'static_library',
-      'variables': {
-        'breakpad_component_target': 1,
-      },
+      'type': '<(breakpad_component_target_type)',
+      'sources': [
+        'breakpad/app/breakpad_linux.cc',
+        'breakpad/app/breakpad_linux.h',
+        'breakpad/app/breakpad_linux_impl.h',
+        'breakpad/app/breakpad_mac.h',
+        'breakpad/app/breakpad_mac.mm',
+        'breakpad/app/breakpad_win.cc',
+        'breakpad/app/breakpad_win.h',
+        'breakpad/app/hard_error_handler_win.cc',
+        'breakpad/app/hard_error_handler_win.h',
+      ],
       'dependencies': [
+        'breakpad_component_lib',
         '../base/base.gyp:base',
       ],
+      'defines': ['BREAKPAD_IMPLEMENTATION'],
       'conditions': [
         ['OS=="mac"', {
           'dependencies': [
@@ -71,6 +83,18 @@
         }],
       ],
     },
+    {
+      'target_name': 'breakpad_test_support',
+      'type': 'none',
+      'dependencies': [
+        'breakpad_component_lib',
+      ],
+      'direct_dependent_settings': {
+        'include_dirs' : [
+          '../breakpad/src',
+        ],
+      }
+    },
   ],
   'conditions': [
     ['OS=="win"', {
@@ -98,11 +122,25 @@
           # content/public/common/content_switches.cc to your sources.
           'target_name': 'breakpad_win64',
           'type': 'static_library',
-          'variables': {
-            'breakpad_component_target': 1,
-          },
+          'sources': [
+            'breakpad/app/breakpad_client.cc',
+            'breakpad/app/breakpad_client.h',
+            'breakpad/app/breakpad_linux.cc',
+            'breakpad/app/breakpad_linux.h',
+            'breakpad/app/breakpad_linux_impl.h',
+            'breakpad/app/breakpad_mac.h',
+            'breakpad/app/breakpad_mac.mm',
+            'breakpad/app/breakpad_win.cc',
+            'breakpad/app/breakpad_win.h',
+            # TODO(siggi): test the x64 version too.
+            'breakpad/app/crash_keys_win.cc',
+            'breakpad/app/crash_keys_win.h',
+            'breakpad/app/hard_error_handler_win.cc',
+            'breakpad/app/hard_error_handler_win.h',
+          ],
           'defines': [
             'COMPILE_CONTENT_STATICALLY',
+            'BREAKPAD_IMPLEMENTATION',
           ],
           'dependencies': [
             '../base/base.gyp:base_win64',