From 91a9763c5fb3f3e5850238fddc4f00c0ea402121 Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Mon, 26 Jun 2023 22:34:56 +0000 Subject: [PATCH] Bindgen 0.65.1 no longer supports size_t-is-usize The flag has been a default, and now is not accepted. Test: Treehugger, m rust Bug: 279198502 Bug: 276464273 Change-Id: I71ebcdbd3606c5dc55bf3454acfba9cc55ad85dd --- diced/open_dice/Android.bp | 3 --- keystore2/aaid/Android.bp | 1 - keystore2/src/crypto/Android.bp | 1 - 3 files changed, 5 deletions(-) diff --git a/diced/open_dice/Android.bp b/diced/open_dice/Android.bp index 2505b426..45cbb676 100644 --- a/diced/open_dice/Android.bp +++ b/diced/open_dice/Android.bp @@ -125,7 +125,6 @@ rust_defaults { crate_name: "open_dice_cbor_bindgen", source_stem: "bindings", bindgen_flags: [ - "--size_t-is-usize", "--rustified-enum DiceConfigType", "--rustified-enum DiceMode", "--rustified-enum DiceResult", @@ -177,8 +176,6 @@ rust_defaults { crate_name: "open_dice_bcc_bindgen", source_stem: "bindings", bindgen_flags: [ - "--size_t-is-usize", - // By generating only essential functions, we can make bindings concise and // optimize compilation time. "--allowlist-function=BccFormatConfigDescriptor", diff --git a/keystore2/aaid/Android.bp b/keystore2/aaid/Android.bp index 3417960d..d0a1e775 100644 --- a/keystore2/aaid/Android.bp +++ b/keystore2/aaid/Android.bp @@ -38,7 +38,6 @@ rust_bindgen { source_stem: "bindings", bindgen_flags: [ - "--size_t-is-usize", "--allowlist-function=aaid_keystore_attestation_id", "--allowlist-var=KEY_ATTESTATION_APPLICATION_ID_MAX_SIZE", ], diff --git a/keystore2/src/crypto/Android.bp b/keystore2/src/crypto/Android.bp index 1ac64674..35fc5a90 100644 --- a/keystore2/src/crypto/Android.bp +++ b/keystore2/src/crypto/Android.bp @@ -69,7 +69,6 @@ rust_bindgen { vendor_available: true, shared_libs: ["libcrypto"], bindgen_flags: [ - "--size_t-is-usize", "--allowlist-function", "hmacSha256", "--allowlist-function", "randomBytes", "--allowlist-function", "AES_gcm_encrypt",