Breakpad: Compile Breakpad into Chromium by default on Mac

chrome/chrome_dll.gypi

 # Copyright (c) 2011 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.
 {
   'conditions': [
     ['OS=="mac" or OS=="win"', {
       'targets': [
         {
           'target_name': 'chrome_dll',
           'type': 'shared_library',
@@ skipping 340 matching lines @@
                 {
                   # Modify the Info.plist as needed.  The script explains why
                   # this is needed.  This is also done in the chrome target.
                   # The framework needs the Breakpad keys if this feature is
                   # enabled.  It does not need the Keystone keys; these always
                   # come from the outer application bundle.  The framework
                   # doesn't currently use the Subversion keys for anything,
                   # but this seems like a really good place to store them.
                   'postbuild_name': 'Tweak Info.plist',
                   'action': ['<(tweak_info_plist_path)',
-                             '-b<(mac_breakpad)',
+                             '--breakpad=<(mac_breakpad_compiled_in)',
+                             '--breakpad_uploads=<(mac_breakpad_uploads)',
                              '-k0',
                              '-s1',
                              '<(branding)',
                              '<(mac_bundle_id)'],
                 },
                 {
                   'postbuild_name': 'Symlink Libraries',
                   'action': [
                     'ln',
                     '-fhs',
@@ skipping 73 matching lines @@
                           '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Default Apps',
                       'files': ['<@(default_apps_list)'],
                     },
                   ],
                 }],
                 ['mac_breakpad==1', {
                   'variables': {
                     # A real .dSYM is needed for dump_syms to operate on.
                     'mac_real_dsym': 1,
                   },
+                }],
+                ['mac_breakpad_compiled_in==1', {
                   'sources': [
                     'app/breakpad_mac.mm',
                     'app/breakpad_mac.h',
                   ],
                   'dependencies': [
                     '../breakpad/breakpad.gyp:breakpad',
                     'app/policy/cloud_policy_codegen.gyp:policy',
                   ],
                   'copies': [
                     {
                       'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Resources',
                       'files': [
                         '<(PRODUCT_DIR)/crash_inspector',
                         '<(PRODUCT_DIR)/crash_report_sender.app'
                       ],
                     },
                   ],
-                }, {  # else: mac_breakpad!=1
+                }, {  # else: mac_breakpad_compiled_in!=1
                   # No Breakpad, put in the stubs.
                   'sources': [
                     'app/breakpad_mac_stubs.mm',
                     'app/breakpad_mac.h',
                   ],
-                }],  # mac_breakpad
+                }],  # mac_breakpad_compiled_in
                 ['mac_keystone==1', {
                   'mac_bundle_resources': [
                     'browser/mac/keystone_promote_preflight.sh',
                     'browser/mac/keystone_promote_postflight.sh',
                   ],
                   'postbuilds': [
                     {
                       'postbuild_name': 'Copy KeystoneRegistration.framework',
                       'action': [
                         'tools/build/mac/copy_framework_unversioned',
@@ skipping 18 matching lines @@
                   ],
                 }],
               ],  # conditions
             }],  # OS=="mac"
           ],  # conditions
         },  # target chrome_dll
       ],  # targets
     }],  # OS=="mac" or OS=="win"
   ],
 }