Microdroid: Use libdice_policy_builder
With libdice_policy being refactored, get microdroid_manager to use to
use the builder library.
Test: Built the test-suite
Bug: 291238565
Change-Id: Ib232753709e96fb4e5216fa8ceed42b2321c2f9e
diff --git a/microdroid_manager/Android.bp b/microdroid_manager/Android.bp
index 1696aae..81bb409 100644
--- a/microdroid_manager/Android.bp
+++ b/microdroid_manager/Android.bp
@@ -29,7 +29,7 @@
"libclient_vm_csr",
"libciborium",
"libcoset",
- "libdice_policy",
+ "libdice_policy_builder",
"libdiced_open_dice",
"libdiced_sample_inputs",
"libglob",
diff --git a/microdroid_manager/src/vm_secret.rs b/microdroid_manager/src/vm_secret.rs
index 9b7d4f1..35acdd3 100644
--- a/microdroid_manager/src/vm_secret.rs
+++ b/microdroid_manager/src/vm_secret.rs
@@ -20,7 +20,7 @@
use secretkeeper_comm::data_types::request::Request;
use binder::{Strong};
use coset::CborSerializable;
-use dice_policy::{ConstraintSpec, ConstraintType, DicePolicy, MissingAction};
+use dice_policy_builder::{ConstraintSpec, ConstraintType, policy_for_dice_chain, MissingAction};
use diced_open_dice::{DiceArtifacts, OwnedDiceArtifacts};
use keystore2_crypto::ZVec;
use openssl::hkdf::hkdf;
@@ -173,7 +173,7 @@
),
];
- DicePolicy::from_dice_chain(dice, &constraint_spec)?
+ policy_for_dice_chain(dice, &constraint_spec)?
.to_vec()
.map_err(|e| format!("DicePolicy construction failed {e:?}"))
}