Instrumented libraries: do not leave unnecessary files in the product dir.

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 93 matching lines @@
     '%s -j%s' % (make_command, parsed_arguments.jobs),
     # Parallel install is flaky for some packages.
     '%s install -j1' % make_command,
     # Kill the .la files. They contain absolute paths, and will cause build
     # errors in dependent libraries.
     'rm %s/lib/*.la -f' % destdir
   ]
   run_shell_commands(build_and_install_in_destdir,
                      parsed_arguments.verbose, environment)
   fix_rpaths(destdir)
-  shell_call(
+  run_shell_commands([
       # Now move the contents of the temporary destdir to their final place.
-      'cp %s/* %s/ -rdf' % (destdir, install_prefix),
-      parsed_arguments.verbose, environment)
+      # We only care for the contents of lib/.
+      'mkdir -p %s/lib' % install_prefix,
+      'cp %s/lib/* %s/lib/ -rdf' % (destdir, install_prefix)],
+                     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
   # flags must be passed as arguments to make.
   make_args = []
   # Do an optimized build.
   make_args.append('BUILD_OPT=1')
   # Set USE_64=1 on x86_64 systems.
   if platform.architecture()[0] == '64bit':
@@ skipping 41 matching lines @@
       'DESTDIR=%s' % destdir,
       # 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)
   fix_rpaths(destdir)
-  shell_call([
+  run_shell_commands([
       # Now move the contents of the temporary destdir to their final place.
-      'cp %s/* %s/ -rdf' % (destdir, install_prefix)],
-                     parsed_arguments.verbose, environment)
+      # We only care for the contents of lib/.
+      'mkdir -p %s/lib' % install_prefix,
+      'cp %s/lib/* %s/lib/ -rdf' % (destdir, install_prefix)],
+                      parsed_arguments.verbose, environment)
 
 
 def libpci3_make_install(parsed_arguments, environment, install_prefix):
   # pciutils doesn't have a configure script
   # This build script follows debian/rules.
 
   # Find out the package version. We'll use this when creating symlinks.
   dir_name = os.path.split(os.getcwd())[-1]
   match = re.match('pciutils-(\d+\.\d+\.\d+)', dir_name)
   if match is None:
@@ skipping 20 matching lines @@
   ]
   install_args = ['DESTDIR=%s' % destdir]
   run_shell_commands([
       'mkdir -p %s-udeb/usr/bin' % destdir,
       'make -j%s %s' % (parsed_arguments.jobs, ' '.join(make_args + paths)),
       'make -j%s %s install' % (
           parsed_arguments.jobs,
           ' '.join(install_args + paths))],
                      parsed_arguments.verbose, environment)
   fix_rpaths(destdir)
-  # Now move the contents of the temporary destdir to their final place.
+  # Now install the DSOs to their final place.
   run_shell_commands([
-      'cp %s/* %s/ -rd' % (destdir, install_prefix),
-      'mkdir -p %s/lib/' % install_prefix,
+      'mkdir -p %s/lib' % install_prefix,
       'install -m 644 lib/libpci.so* %s/lib/' % install_prefix,
       'ln -sf libpci.so.%s %s/lib/libpci.so.3' % (version, install_prefix)],
                      parsed_arguments.verbose, environment)
 
 
 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':
@@ skipping 155 matching lines @@
   os.chdir(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()