commit 36accbd957a607fb397a8299bd70b13f231f7792
author Matthew Maurer <mmaurer@google.com> Wed Jun 28 18:48:34 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 28 18:48:34 2023 +0000
tree b0b407937b4b8ee16ee89ef67c3f900edd0e44c7
parent 152dd52ee650b788b8b2c51a00d4b20acc622754
parent 91a9763c5fb3f3e5850238fddc4f00c0ea402121

Merge "Bindgen 0.65.1 no longer supports size_t-is-usize"

diced/open_dice/Android.bp

diff --git a/diced/open_dice/Android.bp b/diced/open_dice/Android.bp
index 2505b42..45cbb67 100644
--- a/diced/open_dice/Android.bp
+++ b/diced/open_dice/Android.bp
@@ -125,7 +125,6 @@
     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 @@
     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",

keystore2/aaid/Android.bp

diff --git a/keystore2/aaid/Android.bp b/keystore2/aaid/Android.bp
index 3417960..d0a1e77 100644
--- a/keystore2/aaid/Android.bp
+++ b/keystore2/aaid/Android.bp
@@ -38,7 +38,6 @@
     source_stem: "bindings",
 
     bindgen_flags: [
-        "--size_t-is-usize",
         "--allowlist-function=aaid_keystore_attestation_id",
         "--allowlist-var=KEY_ATTESTATION_APPLICATION_ID_MAX_SIZE",
     ],

keystore2/src/crypto/Android.bp

diff --git a/keystore2/src/crypto/Android.bp b/keystore2/src/crypto/Android.bp
index 1ac6467..35fc5a9 100644
--- a/keystore2/src/crypto/Android.bp
+++ b/keystore2/src/crypto/Android.bp
@@ -69,7 +69,6 @@
     vendor_available: true,
     shared_libs: ["libcrypto"],
     bindgen_flags: [
-        "--size_t-is-usize",
         "--allowlist-function", "hmacSha256",
         "--allowlist-function", "randomBytes",
         "--allowlist-function", "AES_gcm_encrypt",