| commit | e74616ff1cec53de8a31882e7d365448e7e4fad7 | [log] [tgz] |
|---|---|---|
| author | Cole Faust <colefaust@google.com> | Fri Feb 14 12:22:39 2025 -0800 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Feb 14 12:22:39 2025 -0800 |
| tree | 33f8ee62022ffc112e58d6535a2c32c771a22b08 | |
| parent | c705cd26a9800cc1bafe21d2872a380821f57023 [diff] | |
| parent | b6bbd679591e77a68251a9d063eebaa9f237e1c6 [diff] |
Merge "Make fsverity_manifest_generator deterministic" into main am: b6bbd67959 Original change: https://android-review.googlesource.com/c/platform/system/security/+/3496435 Change-Id: I191eb214eab8c660be60cf638e30c67efb192de0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/fsverity/fsverity_manifest_generator.py b/fsverity/fsverity_manifest_generator.py index 1a2fba2..d232450 100644 --- a/fsverity/fsverity_manifest_generator.py +++ b/fsverity/fsverity_manifest_generator.py
@@ -87,7 +87,9 @@ real_digest = digests.digests[real_rel] link_digest.CopyFrom(real_digest) - manifest = digests.SerializeToString() + # Serialize with deterministic=True for reproducible builds and build caching. + # The serialized contents will still change across different versions of protobuf. + manifest = digests.SerializeToString(deterministic=True) with open(args.output, "wb") as f: f.write(manifest)