diff options
| author | Alice Wang <aliceywang@google.com> | 2023-02-06 13:12:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-02-06 13:12:52 +0000 |
| commit | fb38acc4329abaec17701acd391ef7ddcb7cead4 (patch) | |
| tree | a978b703f1a2f8c50b3ce54a8258ccc365196fb3 | |
| parent | a416d97ae110f193e38c07947e36ba5d056ca31f (diff) | |
| parent | ad1935fcd33f9ebacb768b91396208ebcf3a594f (diff) | |
| download | open-dice-fb38acc4329abaec17701acd391ef7ddcb7cead4.tar.gz | |
[ANDROID] Convert DiceResult to enum am: a2ab280bde am: 993508a164 am: ad1935fcd3
Original change: https://android-review.googlesource.com/c/platform/external/open-dice/+/2419317
Change-Id: I29712dd1e67f7db4d04fbf9d9a592ccf21f927bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -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;", ], } |