Change the way instrumented libraries are built.

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 80 matching lines @@
     Exception: if return code after call is not zero.
   """
   child = subprocess.Popen(command, stdout=subprocess.PIPE,
       stderr=subprocess.STDOUT, env=environment, shell=True)
   stdout, stderr = child.communicate()
   if verbose or child.returncode:
     print stdout
   if child.returncode:
     raise Exception("Failed to run: %s" % command)
 
-def configure_make_install(parsed_arguments, environment, install_prefix):
+def destdir_configure_make_install(parsed_arguments, environment,
+                                   install_prefix):
+  configure_command = './configure %s' % parsed_arguments.custom_configure_flags
+  configure_command += ' --libdir=/lib/'
+  shell_call(configure_command, parsed_arguments.verbose, environment)
+  shell_call('make -j%s' % parsed_arguments.jobs,
+      parsed_arguments.verbose, environment)
+  shell_call('make -j%s DESTDIR=%s install' % (parsed_arguments.jobs,
+                                               install_prefix),
+      parsed_arguments.verbose, environment)
+  # Kill the .la files. They contain absolute paths, and will cause build errors
+  # in dependent libraries.
+  shell_call('rm %s/lib/*.la -f' % install_prefix)
+
+def prefix_configure_make_install(parsed_arguments, environment,
+                                  install_prefix):
   configure_command = './configure %s --prefix=%s' % (
       parsed_arguments.custom_configure_flags, install_prefix)
   shell_call(configure_command, parsed_arguments.verbose, environment)
   shell_call('make -j%s' % parsed_arguments.jobs,
       parsed_arguments.verbose, environment)
   shell_call('make -j%s install' % parsed_arguments.jobs,
       parsed_arguments.verbose, environment)
 
 def nss_make_and_copy(parsed_arguments, environment, install_prefix):
   # NSS uses a build system that's different from configure/make/install. All
@@ skipping 40 matching lines @@
     'prefix=%s' % install_prefix,
     # Do not install in lib64/.
     'lib=lib',
     # Skip a step that requires sudo.
     'RAISE_SETFCAP=no'
   ]
   shell_call('make -j%s install %s' % (parsed_arguments.jobs,
     ' '.join(install_args)), parsed_arguments.verbose, environment)
 
 def build_and_install(parsed_arguments, environment, install_prefix):
-  if parsed_arguments.library == 'pango-1.0':
-    # This needs an absolute path and thus cannot be in GYP.
+  if parsed_arguments.build_method == 'destdir':
+    destdir_configure_make_install(parsed_arguments, environment, install_prefix)
+  elif parsed_arguments.build_method == 'prefix':
+    prefix_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_pango':
     parsed_arguments.custom_configure_flags += \
       ' --x-libraries=%s/lib' % install_prefix
     parsed_arguments.custom_configure_flags += \
       ' --x-includes=%s/include' % install_prefix
-
-  if parsed_arguments.library == 'nss':
-    nss_make_and_copy(parsed_arguments, environment, install_prefix)
-  elif parsed_arguments.library == 'libcap2':
-    libcap2_make_install(parsed_arguments, environment, install_prefix)
+    prefix_configure_make_install(parsed_arguments, environment, install_prefix)
   else:
-    configure_make_install(parsed_arguments, environment, install_prefix)
-
+    raise Exception('Unrecognized build method: %s' %
+        parsed_arguments.build_method)
 
 def download_build_install(parsed_arguments):
   sanitizer_params = SUPPORTED_SANITIZERS[parsed_arguments.sanitizer_type]
   
   environment = os.environ.copy()
   # Usage of environment variables CC and CXX prefers usage flags --c-compiler
   # and --cxx-compiler
   if 'CC' not in environment and parsed_arguments.c_compiler:
     environment['CC'] = parsed_arguments.c_compiler
   if 'CXX' not in environment and parsed_arguments.cxx_compiler:
@@ skipping 69 matching lines @@
   argument_parser.add_argument('--custom-linker-flags', default='')
   argument_parser.add_argument('-s', '--sanitizer-type', required=True,
       choices=SUPPORTED_SANITIZERS.keys()) 
   argument_parser.add_argument('-v', '--verbose', action='store_true')
   argument_parser.add_argument('--check-build-deps', action='store_true')
   argument_parser.add_argument('--c-compiler')
   argument_parser.add_argument('--cxx-compiler')
   # This should be a shell script to run before building specific libraries
   # e.g. extracting archives with sources, patching makefiles, etc.
   argument_parser.add_argument('--run-before-build', default='')
+  argument_parser.add_argument('--build-method', default='destdir')
 
   # Ignore all empty arguments because in several cases gyp passes them to the
   # script, but ArgumentParser treats them as positional arguments instead of
   # ignoring (and doesn't have such options).
   parsed_arguments = argument_parser.parse_args(
       [arg for arg in sys.argv[1:] if len(arg) != 0])
   # Ensure current working directory is this script directory.
   os.chdir(get_script_absolute_path())
   # Ensure all build dependencies are installed.
   if parsed_arguments.check_build_deps:
     check_library_build_dependencies(parsed_arguments.library)
     
   download_build_install(parsed_arguments)
 
 
 if __name__ == '__main__':
   main()