aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-04-20 18:28:29 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2021-04-20 18:28:29 +0000
commit2cfc7252234a7f4d08e6d7d1b89a8e17f203ec76 (patch)
treeca065ccf0d9f56638b5c34434ef5b4f91cc2ea49
parent456485fa064f1369bd709b9e6f4d0747ae28f136 (diff)
parentb396c14c71b5630203ec2c26a579cf176502d49f (diff)
downloadbuild-oreo-cts-dev.tar.gz
Merge "Fix bug: include all dirs not just the last one." into oreo-cts-devoreo-cts-dev
-rwxr-xr-xtools/generate-notice-files.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/generate-notice-files.py b/tools/generate-notice-files.py
index 2c319abb6b..2fe0d476a0 100755
--- a/tools/generate-notice-files.py
+++ b/tools/generate-notice-files.py
@@ -231,8 +231,8 @@ def main(argv):
input_dirs = [os.path.normpath(source_dir) for source_dir in args.source_dir]
# Find all the notice files and md5 them
+ files_with_same_hash = defaultdict(list)
for input_dir in input_dirs:
- files_with_same_hash = defaultdict(list)
for root, dir, files in os.walk(input_dir):
for file in files:
matched = True
@@ -252,10 +252,9 @@ def main(argv):
file_md5sum = md5sum(filename)
files_with_same_hash[file_md5sum].append(filename)
- filesets = [sorted(files_with_same_hash[md5]) for md5 in sorted(files_with_same_hash.keys())]
-
print "Combining NOTICE files into text"
+ filesets = [sorted(files_with_same_hash[md5]) for md5 in sorted(files_with_same_hash.keys())]
combine_notice_files_text(filesets, input_dirs, txt_output_file, file_title)
if html_output_file is not None: