Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index fac1a9e80a39449f91bec51eafc8c451240ea106..aa13b0cf7db441f14be05644f5bdab23ce745858 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -1112,6 +1112,8 @@ |
'linux_strip_binary%': 0, |
# Strip the test binaries needed for Linux reliability tests. |
'linux_strip_reliability_tests%': 0, |
+ # If we want stack unwind support for backtrace(). |
+ 'unwind_tables%': 1, |
# Enable TCMalloc. |
'linux_use_tcmalloc%': 1, |
@@ -1289,6 +1291,10 @@ |
# symbols from official builds. |
['(branding=="Chrome" and buildtype=="Official")', { |
'linux_dump_symbols%': 1, |
+ |
+ # Omit unwind support in official builds to save space. We can use |
+ # breakpad for these builds. |
+ 'unwind_tables%': 0, |
}], |
], |
}], # os_posix==1 and OS!="mac" and OS!="ios" |
@@ -3077,14 +3083,6 @@ |
}], |
], |
}], |
- # Can be omitted to reduce output size. Does not seem to affect |
- # crash reporting. |
- ['target_arch=="ia32"', { |
- 'cflags': [ |
- '-fno-unwind-tables', |
- '-fno-asynchronous-unwind-tables', |
- ], |
- }], |
], |
}, |
}, |
@@ -3562,6 +3560,11 @@ |
}], |
], |
}], |
+ ['unwind_tables==1', { |
+ 'cflags': ['-funwind-tables'], |
+ }, { |
+ 'cflags': ['-fno-unwind-tables', '-fno-asynchronous-unwind-tables'], |
+ }], |
['linux_use_tcmalloc==0 and android_use_tcmalloc==0', { |
'defines': ['NO_TCMALLOC'], |
}], |