From a8502b133c2a6c47472ef217239396bd0a45b340 Mon Sep 17 00:00:00 2001 From: "mpearson@chromium.org" Date: Mon, 11 Nov 2013 17:25:33 +0000 Subject: Revert 234207 "Set the default ASan options for executables buil..." Seems to cause two Chrome Memory bots to fail consistently with the error "Failed cbuildbot failed buildpackages failed report" See these links: http://build.chromium.org/p/chromium.memory/builders/Chromium%20OS%20(x86)%20ASAN http://build.chromium.org/p/chromium.memory/builders/Chromium%20OS%20(amd64)%20ASAN If those links break, mpearson@ has a copy of the failure output (too long to paste here). > Set the default ASan options for executables built with ASan on Linux. > > This CL introduces a module, base/debug/sanitizer_options.cc, which will override > the defaults for various dynamic tools (only ASan at this moment). For every executable > built with a dynamic tool this module will be linked into that executable, providing > weak functions to be called by the tool. > > The existing declaration of __asan_default_options() in chrome/app/chrome_exe_main_gtk.cc > has been moved into sanitizer_options.cc (now every binary built with GOOGLE_CHROME_BUILD=1 > will have the same options as google-chrome-asan. > The existing declaration of __asan_default_options() in chrome/nacl/nacl_helper_linux.cc > has been kept as is, but we had to remove -Wl,-u_sanitizer_options_link_helper to avoid picking sanitizer_options.cc. > > GYP changes for OSX and iOS will be committed separately. > > BUG=302040 > R=thakis@chromium.org > > Review URL: https://codereview.chromium.org/25687005 TBR=glider@chromium.org Review URL: https://codereview.chromium.org/68843003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234232 0039d316-1c4b-4281-b951-d872f2087c98 --- build/common.gypi | 5 ----- 1 file changed, 5 deletions(-) (limited to 'build') diff --git a/build/common.gypi b/build/common.gypi index c756cd5..01078b9 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -3326,11 +3326,6 @@ ], }], ], - 'dependencies': [ - # This is only needed for executable targets, but checking _type - # in a target_condition here makes gyp throw an exception. - '<(DEPTH)/base/base.gyp:sanitizer_options', - ], }], ['asan==1', { 'target_conditions': [ -- cgit v1.1