| commit | 4bd03eda162ed52de8733e6a67a2e788492e4d9f | [log] [tgz] |
|---|---|---|
| author | Kelvin Zhang <zhangkelvin@google.com> | Wed Jan 11 04:02:37 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 11 04:02:37 2023 +0000 |
| tree | f0479cf7ac6cb61d9e2f64f994ab351ba15b2f7e | |
| parent | 6a991a76ce7966c2d839133a3bf3b04876c87482 [diff] | |
| parent | 183fb0df0effadc784a8ae7e57291a58289041b5 [diff] |
Fix VB 1.0 failure due to openssl output format change am: a7e7e0bbf5 am: dbab538973 am: 96c6d382fa am: 183fb0df0e Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20931268 Change-Id: Icf2c64b5d8a233639f70e64680b4e775de123fa0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tools/releasetools/sign_target_files_apks.py b/tools/releasetools/sign_target_files_apks.py index 936ef88..cc14a80 100755 --- a/tools/releasetools/sign_target_files_apks.py +++ b/tools/releasetools/sign_target_files_apks.py
@@ -964,7 +964,7 @@ keyid, stderr = p.communicate() assert p.returncode == 0, "Failed to dump certificate: {}".format(stderr) keyid = re.search( - r'keyid:([0-9a-fA-F:]*)', keyid).group(1).replace(':', '').lower() + r'Authority Key Identifier:\s*(?:keyid:)?([0-9a-fA-F:]*)', keyid).group(1).replace(':', '').lower() print("Replacing verity keyid with {}".format(keyid)) out_buffer.append("veritykeyid=id:%s" % (keyid,))