commit cfd7c0f39aeaf6ea98135b999b64196a7ba2eb47
author David Anderson <dvander@google.com> Tue Jun 29 19:59:22 2021 -0700
committer David Anderson <dvander@google.com> Thu Jul 01 15:49:09 2021 -0700
tree c20de75b179e5474001dadfd283e8bd6c5fbe318
parent e2b83494b3c7f74f39f94ca94f77f931e58f13a4

Report source and target build fingerprints in SNAPSHOT_MERGE_REPORTED.

Bug: 188909957
Test: manual test
Change-Id: I108c20cf1e092478be2ae59701514f32d9b0a9f3
Merged-In: I108c20cf1e092478be2ae59701514f32d9b0a9f3

aosp/cleanup_previous_update_action.cc

diff --git a/aosp/cleanup_previous_update_action.cc b/aosp/cleanup_previous_update_action.cc
index 5084c1e..53cb993 100644
--- a/aosp/cleanup_previous_update_action.cc
+++ b/aosp/cleanup_previous_update_action.cc
@@ -485,6 +485,9 @@
   // However, we have saved the flag in the snapshot report.
   bool vab_compression_used = report.compression_enabled();
 
+  auto target_build_fingerprint =
+      android::base::GetProperty("ro.build.fingerprint", "");
+
   LOG(INFO) << "Reporting merge stats: "
             << android::snapshot::UpdateState_Name(report.state()) << " in "
             << passed_ms.count() << "ms (resumed " << report.resume_count()
@@ -502,7 +505,9 @@
                              report.estimated_cow_size_bytes(),
                              report.boot_complete_time_ms(),
                              report.boot_complete_to_merge_start_time_ms(),
-                             static_cast<int32_t>(report.merge_failure_code()));
+                             static_cast<int32_t>(report.merge_failure_code()),
+                             report.source_build_fingerprint().c_str(),
+                             target_build_fingerprint.c_str());
 #endif
 }