Instrumented libraries: improve handling of custom patches.

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 268 matching lines @@
   with ScopedChangeDirectory(package_directory) as cd_package:
     shell_call('apt-get source %s' % parsed_arguments.package,
                parsed_arguments.verbose)
     # There should be exactly one subdirectory after downloading a package.
     subdirectories = [d for d in os.listdir('.') if os.path.isdir(d)]
     if len(subdirectories) != 1:
       raise (Exception('There was not one directory after downloading '
                        'a package %s' % parsed_arguments.package))
     with ScopedChangeDirectory(subdirectories[0]):
       # Here we are in the package directory.
+      if parsed_arguments.patch:
+        shell_call(
+            'patch -p1 -i %s/%s' %
+            (os.path.relpath(cd_package.old_path),
+             parsed_arguments.patch),
+            parsed_arguments.verbose)
       if parsed_arguments.run_before_build:
         shell_call(
             '%s/%s' %
             (os.path.relpath(cd_package.old_path),
              parsed_arguments.run_before_build),
             parsed_arguments.verbose)
       try:
         build_and_install(parsed_arguments, environment, install_prefix)
       except Exception as exception:
         print exception
@@ skipping 24 matching lines @@
       help='Relative path to the directory for temporary build files')
   argument_parser.add_argument('--extra-configure-flags', default='')
   argument_parser.add_argument('--cflags', default='')
   argument_parser.add_argument('--ldflags', default='')
   argument_parser.add_argument('-s', '--sanitizer-type', required=True,
                                choices=['asan', 'msan', 'tsan'])
   argument_parser.add_argument('-v', '--verbose', action='store_true')
   argument_parser.add_argument('--check-build-deps', action='store_true')
   argument_parser.add_argument('--cc')
   argument_parser.add_argument('--cxx')
-  # 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('--patch', default='')
+  # This should be a shell script to run before building specific libraries.
+  # This will be run after applying the patch above.
   argument_parser.add_argument('--run-before-build', default='')
   argument_parser.add_argument('--build-method', default='destdir')
   argument_parser.add_argument('--sanitizer-blacklist', default='')
 
   # 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_package_build_dependencies(parsed_arguments.package)
 
   download_build_install(parsed_arguments)
 
 
 if __name__ == '__main__':
   main()