From 48df416640c84e0ceaf91bf344ff43181c036ff1 Mon Sep 17 00:00:00 2001 From: Don Garrett Date: Fri, 20 Jan 2012 18:31:23 -0800 Subject: [PATCH] Include libstdc++ in the libraries bundled with delta generator. We have updated the toolchain in the chroot to use a newer version of libstdc++ than what is installed on our workstations. This means this additional library is required to generate deltas outside of the chroot. BUG=chromium-os:25277 TEST=Generated zip file, and ran contents outside of chroot on my workstation. Change-Id: I5a90ee355aabd4849a9186a9a66e3dc9b1c51d52 Reviewed-on: https://gerrit.chromium.org/gerrit/14597 Reviewed-by: Eric M. Blake Reviewed-by: Eric Blake Tested-by: Don Garrett Commit-Ready: Don Garrett --- build_library/generate_au_zip.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build_library/generate_au_zip.py b/build_library/generate_au_zip.py index f1378edabc..32bbe71db9 100755 --- a/build_library/generate_au_zip.py +++ b/build_library/generate_au_zip.py @@ -113,13 +113,15 @@ 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'} + # Feel free to delete any file here if the chroot version is newer than + # the goobuntu workstation version. Otherwise delta generator will break + # when used by the release team to generate a delta. black_list = [ 'linux-vdso.so', 'libgcc_s.so', 'libgthread-2.0.so', 'libpthread.so', 'librt.so', - 'libstdc', 'libgcc_s.so', 'libc.so', 'ld-linux-x86-64',