Revert of Instrumented libraries: turn off leak detection when building with ASan.

third_party/instrumented_libraries/download_build_install.py

 #!/usr/bin/python
 # 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.
 
 """Downloads, builds (with instrumentation) and installs shared libraries."""
 
 import argparse
 import os
 import platform
@@ skipping 187 matching lines @@
 def build_and_install(parsed_arguments, environment, install_prefix):
   if parsed_arguments.build_method == 'destdir':
     destdir_configure_make_install(
         parsed_arguments, environment, install_prefix)
   elif parsed_arguments.build_method == 'custom_nss':
     nss_make_and_copy(parsed_arguments, environment, install_prefix)
   elif parsed_arguments.build_method == 'custom_libcap':
     libcap2_make_install(parsed_arguments, environment, install_prefix)
   elif parsed_arguments.build_method == 'custom_libpci3':
     libpci3_make_install(parsed_arguments, environment, install_prefix)
+  elif parsed_arguments.build_method == 'custom_libappindicator1':
+    environment['CSC'] = '/usr/bin/mono-csc'
+    destdir_configure_make_install(
+        parsed_arguments, environment, install_prefix)
   else:
     raise Exception('Unrecognized build method: %s' %
                     parsed_arguments.build_method)
 
-
 def unescape_flags(s):
   # GYP escapes the build flags as if they are going to be inserted directly
   # into the command line. Since we pass them via CFLAGS/LDFLAGS, we must drop
   # the double quotes accordingly. 
   return ' '.join(shlex.split(s))
 
-
-def build_environment(parsed_arguments, install_prefix):
+def download_build_install(parsed_arguments):
   environment = os.environ.copy()
   # The CC/CXX environment variables take precedence over the command line
   # flags.
   if 'CC' not in environment and parsed_arguments.cc:
     environment['CC'] = parsed_arguments.cc
   if 'CXX' not in environment and parsed_arguments.cxx:
     environment['CXX'] = parsed_arguments.cxx
 
+  product_directory = os.path.normpath('%s/%s' % (
+      get_script_absolute_path(),
+      parsed_arguments.product_directory))
+
   cflags = unescape_flags(parsed_arguments.cflags)
   if parsed_arguments.sanitizer_blacklist:
     cflags += ' -fsanitize-blacklist=%s/%s' % (
         product_directory,
         parsed_arguments.sanitizer_blacklist)
   environment['CFLAGS'] = cflags
   environment['CXXFLAGS'] = cflags
 
+  install_prefix = '%s/instrumented_libraries/%s' % (
+      product_directory,
+      parsed_arguments.sanitizer_type)
+
   ldflags = unescape_flags(parsed_arguments.ldflags)
   # Make sure the linker searches the instrumented libraries dir for
   # library dependencies.
   environment['LDFLAGS'] = '%s -L%s/lib' % (ldflags, install_prefix)
 
-  if parsed_arguments.sanitizer_type == 'asan':
-    # Do not report leaks during the build process.
-    environment['ASAN_OPTIONS'] = '%s:detect_leaks=0' % \
-        environment.get('ASAN_OPTIONS', '')
-
-  # libappindicator1 needs this.
-  environment['CSC'] = '/usr/bin/mono-csc'
-  return environment
-
-
-
-def download_build_install(parsed_arguments):
-  product_directory = os.path.normpath('%s/%s' % (
-      get_script_absolute_path(),
-      parsed_arguments.product_directory))
-
-  install_prefix = '%s/instrumented_libraries/%s' % (
-      product_directory,
-      parsed_arguments.sanitizer_type)
-
-  environment = build_environment(parsed_arguments, install_prefix)
-
   package_directory = '%s/%s' % (parsed_arguments.intermediate_directory,
                                  parsed_arguments.package)
 
   # Clobber by default, unless the developer wants to hack on the package's
   # source code.
   clobber = (environment.get('INSTRUMENTED_LIBRARIES_NO_CLOBBER', '') != '1')
 
   download_source = True
   if os.path.exists(package_directory):
     if clobber:
@@ skipping 83 matching lines @@
   os.chdir(get_script_absolute_path())
   # Ensure all build dependencies are installed.
   if parsed_arguments.check_build_deps:
     check_package_build_dependencies(parsed_arguments.package)
 
   download_build_install(parsed_arguments)
 
 
 if __name__ == '__main__':
   main()