Only enable breakpad and keystone for official branded builds so the rolling ...

chrome/chrome.gyp

 # Copyright (c) 2009 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.
 
 {
   'variables': {
     'chromium_code': 1,
     # Define the common dependencies that contain all the actual
     # Chromium functionality.  This list gets pulled in below by
     # the link of the actual chrome (or chromium) executable on
@@ skipping 2583 matching lines @@
               'variables': {
                 'bundle_id': 'com.google.Chrome',
               },
             }, {  # else: 'branding!="Chrome"
               'mac_bundle_resources': ['app/theme/chromium/app.icns'],
               'variables': {
                 'bundle_id': 'org.chromium.Chromium',
               },
             }],
             ['mac_breakpad==1', {
-              # Only include breakpad in official builds.
               'variables': {
                 # A real .dSYM is needed for dump_syms to operate on.
                 'mac_real_dsym': 1,
               },
               'dependencies': [
                 '../breakpad/breakpad.gyp:breakpad',
                 '../breakpad/breakpad.gyp:dump_syms',
                 '../breakpad/breakpad.gyp:symupload',
               ],
               'copies': [
@@ skipping 1353 matching lines @@
             'Debug': {
               'msvs_precompiled_header': 'tools/build/win/precompiled_wtl.h',
               'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc',
             },
           },
         }], # OS="win"
       ], # conditions
     },
   ],
   'conditions': [
-    # We set feature variables so the different parts that need to check for
-    # the mac build use of breakpad/keystone, check that flag instead of coding
-    # it based on branding.
-    # We need the Mac app name on disk, so we stick this into a variable so
-    # the different places that need it can use the common variable.
-    # NOTE: chrome/app/theme/chromium/BRANDING and
-    # chrome/app/theme/google_chrome/BRANDING have the short names, etc.;
-    # but extracting from there still means xcodeproject are out of date until
-    # the next project regeneration.
-    ['OS=="mac" and branding=="Chrome"', {
-      'variables': {
-        'mac_breakpad%': 1,
-        'mac_keystone%': 1,
-        'mac_product_name%': 'Google Chrome',
-      }
-    }, {
-      'variables': {
-        'mac_breakpad%': 0,
-        'mac_keystone%': 0,
-        'mac_product_name%': 'Chromium',
-      }
+    ['OS=="mac"', {
+      'conditions': [
+        # We need the Mac app name on disk, so we stick this into a variable so
+        # the different places that need it can use the common variable.
+        # NOTE: chrome/app/theme/chromium/BRANDING and
+        # chrome/app/theme/google_chrome/BRANDING have the short names, etc.;
+        # but extracting from there still means xcodeproject are out of date until
+        # the next project regeneration.
+        ['branding=="Chrome"', {
+          'variables': {
+            'mac_product_name%': 'Google Chrome',
+          }
+        }, {
+          'variables': {
+            'mac_product_name%': 'Chromium',
+          }
+        }],
+        # We set feature variables so the different parts of the gyp file use
+        # these vars in conditions instead of repeating the check of branding
+        # and buildtype.
+        ['branding=="Chrome" and buildtype=="Official"', {
+          'variables': {
+            'mac_breakpad%': 1,
+            'mac_keystone%': 1,
+          }
+        }, {
+          'variables': {
+            'mac_breakpad%': 0,
+            'mac_keystone%': 0,
+          }
+        }],
+      ],
     }],
     ['OS=="linux"', {
       'conditions': [
         # Only Chrome builds get breakpad since crash processing is internal.
         ['branding=="Chrome"', {
           'variables': {
             'linux_breakpad%': 1,
           },
         }, {
           'variables': {
@@ skipping 924 matching lines @@
               # Use outputs of this action as inputs for the main target build.
               # Seems as a misnomer but makes this happy on Linux (scons).
               'process_outputs_as_sources': 1,
             },
           ],  # 'actions'
         },
       ]
     }],
   ],  # 'conditions'
 }