diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2021-05-05 00:21:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-05-05 00:21:58 +0000 |
| commit | e0ab29ba6e662366d7fa4f6a377b7c4149cc9e40 (patch) | |
| tree | 9d2d565c9aded63e1aff0c437d665639590421e1 | |
| parent | 3e91968ef6d62cada3d4800da7ca332f9cbdc7a7 (diff) | |
| parent | 8f21b688f45c614b946a5c7f3a0c91c6cf4eb4dc (diff) | |
| download | build-android-cts-10.0_r8.tar.gz | |
Merge "Make change and version bump to QTR1.210409.001.A1" into sparse-7272141-L59000000878665001android-cts-10.0_r8
| -rw-r--r-- | core/build_id.mk | 2 | ||||
| -rwxr-xr-x | tools/generate-notice-files.py | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/core/build_id.mk b/core/build_id.mk index a77f2dee82..8ee8d99fa7 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID=QTR1.210409.001 +BUILD_ID=QTR1.210409.001.A1 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: |