commit b9c83c6205b4b8925979080310e5c25fc478e688
author Pierre-Clément Tosi <ptosi@google.com> Tue Nov 19 16:22:17 2024 +0000
committer Pierre-Clément Tosi <ptosi@google.com> Tue Jan 07 16:21:42 2025 +0000
tree 0af08168c710b95db19c49b4432bac7882d32678
parent 495c67a443eac29bb71d221d3cff103761a1bdc6

pvmfw: Drop cfg!(llpvm_changes)

The underlying Android Build flag is always enabled now.

Bug: 377276983
Test: m pvmfw_bin
Change-Id: I4db0655673a3186897ac465ab66b95cc32434b08

guest/pvmfw/src/main.rs

diff --git a/guest/pvmfw/src/main.rs b/guest/pvmfw/src/main.rs
index d04db06..607d4f2 100644
--- a/guest/pvmfw/src/main.rs
+++ b/guest/pvmfw/src/main.rs
@@ -131,7 +131,7 @@
         RebootReason::InternalError
     })?;
 
-    let instance_hash = if cfg!(llpvm_changes) { Some(salt_from_instance_id(fdt)?) } else { None };
+    let instance_hash = Some(salt_from_instance_id(fdt)?);
     let (new_instance, salt, defer_rollback_protection) = perform_rollback_protection(
         fdt,
         &verified_boot_data,