Revert 259561 "Set the default ASan options for executables buil..."

trunk/src/components/nacl.gyp

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     'nacl/nacl_defines.gypi',
@@ skipping 171 matching lines @@
               ],
               'dependencies': [
                 'nacl',
                 'nacl_common',
                 '../components/tracing.gyp:tracing',
                 '../crypto/crypto.gyp:crypto',
                 '../sandbox/sandbox.gyp:libc_urandom_override',
                 '../sandbox/sandbox.gyp:sandbox',
                 '../ppapi/ppapi_internal.gyp:ppapi_proxy',
               ],
-              'ldflags!': [
-                # Do not pick the default ASan options from
-                # base/debug/sanitizer_options.cc to avoid th conflict with
-                # those in nacl/nacl_helper_linux.cc.
-                '-Wl,-u_sanitizer_options_link_helper',
-              ],
               'defines': [
                 '<@(nacl_defines)',
                 # Allow .cc files to know if they're being compiled as part
                 # of nacl_helper.
                 'IN_NACL_HELPER=1',
               ],
               'sources': [
                 'nacl/loader/nacl_helper_linux.cc',
                 'nacl/loader/nacl_helper_linux.h',
                 'nacl/loader/nacl_sandbox_linux.cc',
@@ skipping 194 matching lines @@
       ],
       'include_dirs': [
         '..',
       ],
       'dependencies': [
         '../content/content.gyp:content_common',
       ],
     },
   ]
 }