pvmfw: Drop cfg!(llpvm_changes)
The underlying Android Build flag is always enabled now.
Bug: 377276983
Test: m pvmfw_bin
Change-Id: I4db0655673a3186897ac465ab66b95cc32434b08
diff --git a/guest/pvmfw/avb/tests/utils.rs b/guest/pvmfw/avb/tests/utils.rs
index 79552b5..e8590ac 100644
--- a/guest/pvmfw/avb/tests/utils.rs
+++ b/guest/pvmfw/avb/tests/utils.rs
@@ -124,8 +124,7 @@
let footer = extract_avb_footer(&kernel)?;
let kernel_digest =
hash(&[&hash(&[b"bootloader"]), &kernel[..usize::try_from(footer.original_image_size)?]]);
- let capabilities =
- if cfg!(llpvm_changes) { vec![Capability::SecretkeeperProtection] } else { vec![] };
+ let capabilities = vec![Capability::SecretkeeperProtection];
let initrd_digest = Some(hash(&[&hash(&[initrd_salt]), initrd]));
let expected_boot_data = VerifiedBootData {
debug_level: expected_debug_level,
@@ -133,7 +132,7 @@
initrd_digest,
public_key: &public_key,
capabilities,
- rollback_index: if cfg!(llpvm_changes) { 1 } else { 0 },
+ rollback_index: 1,
page_size,
};
assert_eq!(expected_boot_data, verified_boot_data);
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,