diff options
| author | yutak@chromium.org <yutak@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-25 11:23:45 +0000 |
|---|---|---|
| committer | yutak@chromium.org <yutak@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-25 11:23:45 +0000 |
| commit | bbdd97bbc006c4ecba801d604e720883a9c0f0ce (patch) | |
| tree | 4716f63969bb30847cf8335f9d2a4838db51332d /build | |
| parent | 0935275316a0edc8595edf0fc268f69adf1e0d86 (diff) | |
| download | chromium_src-bbdd97bbc006c4ecba801d604e720883a9c0f0ce.zip chromium_src-bbdd97bbc006c4ecba801d604e720883a9c0f0ce.tar.gz chromium_src-bbdd97bbc006c4ecba801d604e720883a9c0f0ce.tar.bz2 | |
Reverting 24220.
It seemed that r24220 caused failures on all of Linux UI (valgrind) bots.
TBR=thestig@chromium.org
Review URL: http://codereview.chromium.org/173345
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24228 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/build/common.gypi b/build/common.gypi index 694dd32..5b7790d 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -31,10 +31,6 @@ # 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 @@ -76,9 +72,9 @@ # 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. @@ -118,15 +114,6 @@ '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 @@ -179,6 +166,11 @@ 'conditions': [ ['branding=="Chrome"', { 'defines': ['GOOGLE_CHROME_BUILD'], + 'conditions': [ + ['OS=="linux"', { + 'cflags': [ '-gstabs' ], + }], + ], }, { # else: branding!="Chrome" 'defines': ['CHROMIUM_BUILD'], }], @@ -547,10 +539,6 @@ '-fno-strict-aliasing', ], }], - ['linux_breakpad==1', { - 'cflags': [ '-gstabs' ], - 'defines': ['USE_LINUX_BREAKPAD'], - }], ], }, }], |