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

trunk/src/chrome/nacl.gypi

 # Copyright (c) 2012 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.
 
 {
   'conditions': [
     ['disable_nacl!=1', {
       'conditions': [
         ['OS=="linux"', {
           'includes': [
             '../components/nacl/nacl_defines.gypi',
           ],
           'targets': [
             {
               'target_name': 'nacl_helper',
               'type': 'executable',
               'include_dirs': [
                 '..',
               ],
               'dependencies': [
                 '../components/nacl.gyp:nacl',
                 '../components/nacl_common.gyp:nacl_common',
                 '../crypto/crypto.gyp:crypto',
                 '../sandbox/sandbox.gyp:libc_urandom_override',
                 '../sandbox/sandbox.gyp:sandbox',
               ],
-              '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)',
               ],
               'sources': [
                 'nacl/nacl_helper_linux.cc',
                 '../base/posix/unix_domain_socket_linux.cc',
                 '../components/nacl/loader/nacl_sandbox_linux.cc',
                 '../content/common/child_process_sandbox_support_impl_shm_linux.cc',
                 '../content/common/sandbox_init_linux.cc',
                 '../content/common/sandbox_seccomp_bpf_linux.cc',
@@ skipping 24 matching lines @@
               'link_settings': {
                 'ldflags': ['-pie'],
               },
             },
           ],
         }],
       ],
     }],
   ],
 }