From c8e3cb091e901b92e6292cf0dc1930e3d1db6c40 Mon Sep 17 00:00:00 2001 From: Don Garrett Date: Fri, 13 Jul 2012 13:50:31 -0700 Subject: [PATCH] Generate_au_zip blacklisting was blacklisting * not nothing. Fix the blacklisting logic, and re-add the magic library linux-vdso.so. BUG=chromium-os:32542 TEST=Run by hand, .zip contents examined by hand. Change-Id: I94d99bf62e5eb011ac70428d7cebeaa852519a78 Reviewed-on: https://gerrit.chromium.org/gerrit/27398 Reviewed-by: Jay Srinivasan Tested-by: Don Garrett Commit-Ready: Don Garrett --- build_library/generate_au_zip.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/build_library/generate_au_zip.py b/build_library/generate_au_zip.py index 3e2ca94655..d14b358862 100755 --- a/build_library/generate_au_zip.py +++ b/build_library/generate_au_zip.py @@ -113,6 +113,12 @@ def CopyRequiredFiles(dest_files_root): # We need directories to be copied recursively to a destination within tempdir recurse_dirs = {'~/trunk/src/scripts/lib/shflags': 'lib/shflags'} + black_list = [ + # This library does not exist on disk, but is inserted into the + # executable's memory space when the executable is loaded by the kernel. + 'linux-vdso.so', + ] + all_files = ldd_files + static_files all_files = map(os.path.expanduser, all_files) @@ -122,7 +128,7 @@ def CopyRequiredFiles(dest_files_root): sys.exit(1) logging.debug('Given files that need to be copied = %s' % '' .join(all_files)) - all_files += DepsToCopy(ldd_files=ldd_files) + all_files += DepsToCopy(ldd_files=ldd_files,black_list=black_list) for file_name in all_files: logging.debug('Copying file %s to %s', file_name, dest_files_root) shutil.copy2(file_name, dest_files_root) @@ -179,6 +185,10 @@ def _ExcludeBlacklist(library_list, black_list=[]): Returns: Filtered library_list """ + + if not black_list: + return library_list + return_list = [] pattern = re.compile(r'|'.join(black_list))