Instrumented libraries: more aggressive cleanup.

third_party/instrumented_libraries/scripts/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 181 matching lines @@
     return os.path.join(self._source_dir, 'debian', 'instrumented_build')
 
   def temp_libdir(self):
     """Returns the directory under temp_dir() containing the DSOs."""
     return os.path.join(self.temp_dir(), self._libdir)
 
   def dest_libdir(self):
     """Returns the final location of the DSOs."""
     return os.path.join(self._destdir, self._libdir)
 
+  def cleanup_after_install(self):
+    """Removes unneeded files in self.temp_libdir()."""
+    # .la files are not needed, nuke them.
+    # In case --no-static is not supported, nuke any static libraries we built.
+    self.shell_call(
+        'find %s -name *.la -or -name *.a | xargs rm -f' % self.temp_libdir())
+    # .pc files are not needed.
+    self.shell_call('rm %s/pkgconfig -rf' % self.temp_libdir())
+
   def make(self, args, jobs=None, env=None, cwd=None):
     """Invokes `make'.
 
     Invokes `make' with the specified args, using self._build_env and
     self._source_dir by default.
     """
     if jobs is None:
       jobs = self._jobs
     if cwd is None:
       cwd = self._source_dir
@@ skipping 17 matching lines @@
     self.shell_call(configure_cmd, env=self._build_env, cwd=self._source_dir)
 
     # Some makefiles use BUILDROOT or INSTALL_ROOT instead of DESTDIR.
     args = ['DESTDIR', 'BUILDROOT', 'INSTALL_ROOT']
     make_args = ['%s=%s' % (name, self.temp_dir()) for name in args]
     self.make(make_args)
 
     # Some packages don't support parallel install. Use -j1 always.
     self.make_install(make_args, jobs=1)
 
-    # .la files are not needed, nuke them.
-    self.shell_call('rm %s/*.la -f' % self.temp_libdir())
+    self.cleanup_after_install()
 
     self.fix_rpaths(self.temp_libdir())
 
     # Now move the contents of the temporary destdir to their final place.
     # We only care for the contents of LIBDIR.
     self.shell_call('cp %s/* %s/ -rdf' % (self.temp_libdir(),
                                           self.dest_libdir()))
 
 
 class LibcapBuilder(InstrumentedPackageBuilder):
   def build_and_install(self):
     # libcap2 doesn't have a configure script
     build_args = ['CC', 'CXX', 'CFLAGS', 'CXXFLAGS', 'LDFLAGS']
     make_args = [
         '%s="%s"' % (name, self._build_env[name]) for name in build_args
     ]
     self.make(make_args)
 
     install_args = [
         'DESTDIR=%s' % self.temp_dir(),
         'lib=%s' % self._libdir,
         # Skip a step that requires sudo.
         'RAISE_SETFCAP=no'
     ]
     self.make_install(install_args)
 
+    self.cleanup_after_install()
+
     self.fix_rpaths(self.temp_libdir())
 
     # Now move the contents of the temporary destdir to their final place.
     # We only care for the contents of LIBDIR.
     self.shell_call('cp %s/* %s/ -rdf' % (self.temp_libdir(),
                                           self.dest_libdir()))
 
 
 class Libpci3Builder(InstrumentedPackageBuilder):
   def package_version(self):
@@ skipping 140 matching lines @@
     builder = LibcapBuilder(args, clobber)
   elif args.build_method == 'custom_libpci3':
     builder = Libpci3Builder(args, clobber)
   else:
     raise Exception('Unrecognized build method: %s' % args.build_method)
 
   builder.download_build_install()
 
 if __name__ == '__main__':
   main()