[ANDROID] Convert DiceResult to enum

Test: atest diced_utils_test diced_sample_inputs_test \
diced_test diced_vendor_test
Test: m pvmfw_img microdroid_manager && atest \
microdroid_manager_test
Bug: 267575445

Change-Id: I7d9f1e30fc30f17929c279a0637200023007c1bc

1 files changed, 7 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index b692a01..15e172f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -204,6 +204,7 @@ rust_defaults {
         "--size_t-is-usize",
         "--rustified-enum DiceConfigType",
         "--rustified-enum DiceMode",
+        "--rustified-enum DiceResult",
 
         "--allowlist-function=DiceDeriveCdiPrivateKeySeed",
         "--allowlist-function=DiceDeriveCdiCertificateId",
@@ -278,6 +279,12 @@ rust_defaults {
         "--blocklist-type=DiceInputValues",
         "--raw-line",
         "pub use open_dice_cbor_bindgen::DiceInputValues;",
+
+        // Prevent DiceResult from being generated a second time and
+        // import it instead from open_dice_cbor_bindgen.
+        "--blocklist-type=DiceResult",
+        "--raw-line",
+        "pub use open_dice_cbor_bindgen::DiceResult;",
     ],
 
 }