diff options
| author | Kelvin Zhang <zhangkelvin@google.com> | 2023-01-05 22:43:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-01-05 22:43:19 +0000 |
| commit | d2126e1eeed3f0b4de86340821b34145de5abbb2 (patch) | |
| tree | 5c4f541cf58a3f15698572f057cabf89e875ffcb | |
| parent | 5fddd028e8d725bf08f72d9c9cfdf041cc920115 (diff) | |
| parent | 9f0379bd60749b375865bd5875cd1c4e52742922 (diff) | |
| download | build-d2126e1eeed3f0b4de86340821b34145de5abbb2.tar.gz | |
Fix VB 1.0 failure due to openssl output format change am: 9f0379bd60
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20882222
Change-Id: I0dbbab45f6f392f30884ab03993fea9c6d3f71ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rwxr-xr-x | tools/releasetools/sign_target_files_apks.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/releasetools/sign_target_files_apks.py b/tools/releasetools/sign_target_files_apks.py index 837eaf9c1e..09d0b10a42 100755 --- a/tools/releasetools/sign_target_files_apks.py +++ b/tools/releasetools/sign_target_files_apks.py @@ -1032,7 +1032,7 @@ def ReplaceVerityKeyId(input_zip, output_zip, key_path): 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,)) |