commit f4b8b001dbc2adbf3a7ba5c613f99af27fb4d398
author Alice Wang <aliceywang@google.com> Wed Feb 08 08:53:23 2023 +0000
committer Alice Wang <aliceywang@google.com> Wed Feb 08 20:59:12 2023 +0000
tree ba9a726f8aee377d855403e6ea7e1f41231877ba
parent dad3dc487dd389560bbb1d86c18e260545390d25

[dice] Use retry_bcc_main_flow from the library libdiced_open_dice

And use the upstream open-dice wrapper library (libdiced_open_dice)
directly in microdroid.

This is part of the project of merging the two existing dice
wrapper libraries into one library. The upstream library
libdiced_open_dice will be the merged library.

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

Change-Id: Ie69f05f3673639f7f958d3ae82578459a6df285e

microdroid_manager/Android.bp

diff --git a/microdroid_manager/Android.bp b/microdroid_manager/Android.bp
index 383f371..bf2d755 100644
--- a/microdroid_manager/Android.bp
+++ b/microdroid_manager/Android.bp
@@ -19,8 +19,7 @@
         "libbinder_rs",
         "libbyteorder",
         "libcap_rust",
-        "libdiced",
-        "libdiced_open_dice_cbor",
+        "libdiced_open_dice",
         "libdiced_sample_inputs",
         "libdiced_utils",
         "libglob",