| Index: build/common.gypi
|
| diff --git a/build/common.gypi b/build/common.gypi
|
| index f2c857f0137fa841959ca9d68797cdf15000b1c6..059c77fd77e6e5d0eb0c432d814e321a7cfdd1a1 100644
|
| --- a/build/common.gypi
|
| +++ b/build/common.gypi
|
| @@ -844,9 +844,9 @@
|
|
|
| # Enable strict glibc debug mode.
|
| 'glibcxx_debug%': 0,
|
| -
|
| - # Override whether we should use Breakpad on Linux. I.e. for Chrome bot.
|
| - 'linux_breakpad%': 0,
|
| + # Compile in Breakpad support by default so that it can be tested,
|
| + # even if it not enabled by default at runtime.
|
| + 'linux_breakpad%': 1,
|
| # And if we want to dump symbols for Breakpad-enabled builds.
|
| 'linux_dump_symbols%': 0,
|
| # And if we want to strip the binary after dumping symbols.
|
| @@ -1009,9 +1009,6 @@
|
| }, {
|
| 'gcc_version%': 0,
|
| }],
|
| - ['branding=="Chrome"', {
|
| - 'linux_breakpad%': 1,
|
| - }],
|
| # All Chrome builds have breakpad symbols, but only process the
|
| # symbols from official builds.
|
| ['(branding=="Chrome" and buildtype=="Official")', {
|
| @@ -2787,8 +2784,10 @@
|
| ],
|
| }],
|
| ['linux_breakpad==1', {
|
| - 'cflags': [ '-g' ],
|
| 'defines': ['USE_LINUX_BREAKPAD'],
|
| + }],
|
| + ['linux_dump_symbols==1', {
|
| + 'cflags': [ '-g' ],
|
| 'conditions': [
|
| ['target_arch=="ia32"', {
|
| 'target_conditions': [
|
|
|