Index: chrome/app/chrome_exe_main_gtk.cc |
=================================================================== |
--- chrome/app/chrome_exe_main_gtk.cc (revision 232083) |
+++ chrome/app/chrome_exe_main_gtk.cc (working copy) |
@@ -10,31 +10,6 @@ |
// order to make it easy to update the app from GoogleUpdate. We don't need |
// that extra layer with on linux. |
-#if defined(ADDRESS_SANITIZER) && defined(GOOGLE_CHROME_BUILD) |
-// Default AddressSanitizer options for the official build. These do not affect |
-// tests or non-official Chromium builds. |
-// - disable the strict memcmp() checking (http://crbug.com/178677 and |
-// http://crbug.com/178404). |
-// - set the malloc_context_size (i.e. the size of stack traces collected by |
-// ASan for each malloc/free) to 5. These stack traces tend to accumulate |
-// very fast in applications using JIT (v8 in Chrome's case), see |
-// https://code.google.com/p/address-sanitizer/issues/detail?id=177 |
-// - disable the in-process symbolization, which isn't 100% compatible with |
-// the existing sandboxes and doesn't make much sense for stripped official |
-// binaries. |
-const char *kAsanDefaultOptions = |
- "malloc_context_size=5 strict_memcmp=0 symbolize=false"; |
- |
-// Override the default ASan options for the Google Chrome executable. |
-// __asan_default_options should not be instrumented, because it is called |
-// before ASan is initialized. |
-extern "C" |
-__attribute__((no_address_safety_analysis)) |
-const char *__asan_default_options() { |
- return kAsanDefaultOptions; |
-} |
-#endif |
- |
extern "C" { |
int ChromeMain(int argc, const char** argv); |
} |