Reverting 24220.

build/common.gypi

 # 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': {
     # .gyp files should set chromium_code to 1 if they build Chromium-specific
     # code, as opposed to external code.  This variable is used to control
     # such things as the set of warnings to enable, and whether warnings are
     # treated as errors.
@@ skipping 13 matching lines @@
 
       # Override buildtype to select the desired build flavor.
       # Dev - everyday build for development/testing
       # Official - release build (generally implies additional processing)
       # TODO(mmoss) Once 'buildtype' is fully supported (e.g. Windows gyp
       # conversion is done), some of the things which are now controlled by
       # 'branding', such as symbol generation, will need to be refactored based
       # on 'buildtype' (i.e. we don't care about saving symbols for non-Official
       # builds).
       'buildtype%': 'Dev',
-
-      # We do want to build Chromium with Breakpad support in certain
-      # situations. I.e. for Chrome bot.
-      'linux_chromium_breakpad%': 0,
     },
 
     # Define branding and buildtype on the basis of their settings within the
     # variables sub-dict above, unless overridden.
     'branding%': '<(branding)',
     'buildtype%': '<(buildtype)',
 
     # Override chromium_mac_pch and set it to 0 to suppress the use of
     # precompiled headers on the Mac.  Prefix header injection may still be
     # used, but prefix headers will not be precompiled.  This is useful when
@@ skipping 21 matching lines @@
     # {'variables': {'library': 'shared_library'}}
     # to compile as shared by default
     'library%': 'static_library',
 
     # TODO(bradnelson): eliminate this when possible.
     # To allow local gyp files to prevent release.vsprops from being included.
     # Yes(1) means include release.vsprops.
     # Once all vsprops settings are migrated into gyp, this can go away.
     'msvs_use_common_release%': 1,
 
-    # TODO(bradnelson): eliminate this when possible.
-    # To allow local gyp files to override additional linker options for msvs.
-    # Yes(1) means set use the common linker options.
+    # TODO(bradnelson): eliminate this when possible.    
+    # To allow local gyp files to override additional linker options for msvs. 
+    # Yes(1) means set use the common linker options.        
     'msvs_use_common_linker_extras%': 1,
 
     # TODO(sgk): eliminate this if possible.
     # It would be nicer to support this via a setting in 'target_defaults'
     # in chrome/app/locales/locales.gypi overriding the setting in the
     # 'Debug' configuration in the 'target_defaults' dict below,
     # but that doesn't work as we'd like.
     'msvs_debug_link_incremental%': '2',
 
     # The architecture that we're building on.
@@ skipping 19 matching lines @@
     # sandbox the zygote process and, thus, all renderer processes.
     'linux_sandbox_path%': '',
 
     # If |linux_suid_sandbox_restrictions|, above, is 'Path' then only a single
     # path is allowed to be exec'ed by the sandbox for security reasons. That
     # path is set here. It should be the final location of the Chromium binary
     # on the system.
     'linux_sandbox_chrome_path%': '/opt/google/chrome/chrome',
 
     'conditions': [
-      ['OS=="linux"', {
-        'conditions': [
-          ['branding=="Chrome" or linux_chromium_breakpad==1', {
-            'linux_breakpad%': 1,
-          }, {
-            'linux_breakpad%': 0,
-          }],
-        ],
-      }],  # OS=="linux"
       ['OS=="mac"', {
         'conditions': [
           # mac_product_name is set to the name of the .app bundle as it should
           # appear on disk.  This duplicates data from
           # chrome/app/theme/chromium/BRANDING and
           # chrome/app/theme/google_chrome/BRANDING, but is necessary to get
           # these names into the build system.
           ['branding=="Chrome"', {
             'mac_product_name%': 'Google Chrome',
           }, { # else: branding!="Chrome"
@@ skipping 32 matching lines @@
       }],
     ],
   },
   'target_defaults': {
     'variables': {
       'mac_release_optimization%': '2'  # Use -O2 unless overridden
     },
     'conditions': [
       ['branding=="Chrome"', {
         'defines': ['GOOGLE_CHROME_BUILD'],
+        'conditions': [
+          ['OS=="linux"', {
+            'cflags': [ '-gstabs' ],
+          }],
+        ],
       }, {  # else: branding!="Chrome"
         'defines': ['CHROMIUM_BUILD'],
       }],
       ['toolkit_views==1', {
         'defines': ['TOOLKIT_VIEWS=1'],
       }],
       ['chromeos==1', {
         'defines': ['OS_CHROMEOS=1'],
       }],
       ['coverage!=0', {
@@ skipping 348 matching lines @@
                   '-mfloat-abi=softfp',
                 ],
               }],
             ],
           }],
           ['no_strict_aliasing==1', {
             'cflags': [
               '-fno-strict-aliasing',
             ],
           }],
-          ['linux_breakpad==1', {
-            'cflags': [ '-gstabs' ],
-            'defines': ['USE_LINUX_BREAKPAD'],
-          }],
         ],
       },
     }],
     ['OS=="mac"', {
       'target_defaults': {
         'variables': {
           # This should be 'mac_real_dsym%', but there seems to be a bug
           # with % in variables that are intended to be set to different
           # values in different targets, like this one.
           'mac_real_dsym': 0,  # Fake .dSYMs are fine in most cases.
@@ skipping 206 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }