diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-14 23:34:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-07-14 23:34:21 +0000 |
| commit | caeed45d9b1b15b739e0c7c093ccedd67aa64776 (patch) | |
| tree | b1fa7f702a04982cfd4b03cb0dc0b4f2b103d20a | |
| parent | 2e9c81eed219714dca2aadf26bb2698a7c3e27c9 (diff) | |
| parent | 4151d04dde8876ddc45bcf8afc726841e4bee951 (diff) | |
| download | build-caeed45d9b1b15b739e0c7c093ccedd67aa64776.tar.gz | |
Merge "Make change and version bump to OMC1.210714.001" into oreo-mr1-cts-releaseandroid-cts-8.1_r24
| -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 b15fd8cefe..f426f0b051 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. -export BUILD_ID=OMC1.210414.002 +export BUILD_ID=OMC1.210714.001 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: |