diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-30 18:23:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-04-30 18:23:48 +0000 |
| commit | 0d3144194a9c74c98d40a5269e64ae34ba3f13ec (patch) | |
| tree | 9e3be8699475ff4e9f61598b122de713ad31bf40 | |
| parent | 7f8afec062fd425dbde53dff083f907dc753bcdb (diff) | |
| parent | d1390d2da0eb7eb0d25b126780aaa2a1ac4ca867 (diff) | |
| download | build-android10-tests-dev.tar.gz | |
Merge "Fix bug: include all dirs not just the last one." into android10-tests-devandroid10-tests-dev
| -rwxr-xr-x | tools/generate-notice-files.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/generate-notice-files.py b/tools/generate-notice-files.py index 18f2166fbd..bf958fbae4 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 @@ -254,8 +254,7 @@ 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())] - + 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: |