| commit | b4dc02e6b88f742cfa91d0f7539a141b6a9901a3 | [log] [tgz] |
|---|---|---|
| author | Orlando Arbildo <oarbildo@google.com> | Thu Jun 20 17:53:05 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 20 17:53:05 2024 +0000 |
| tree | f5ef515e433622be71e4b4cd9978d3c97c15d705 | |
| parent | 5468e7726729c9b51ba90835814ac9829634133d [diff] | |
| parent | b902e39c9cf0de4edf8ce9bbff48c028ea25f2ba [diff] |
Merge "Add rust copy derivation annotation" into main am: cb29d45649 am: b902e39c9c Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3047421 Change-Id: I22d10329eef2f6ad8d96969d80350d4530ba5b30 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/staging/security/see/hwcrypto/aidl/aidl_api/android.hardware.security.see/current/android/hardware/security/see/hwcrypto/types/MemoryBufferReference.aidl b/staging/security/see/hwcrypto/aidl/aidl_api/android.hardware.security.see/current/android/hardware/security/see/hwcrypto/types/MemoryBufferReference.aidl index eaa8dd7..59c8757 100644 --- a/staging/security/see/hwcrypto/aidl/aidl_api/android.hardware.security.see/current/android/hardware/security/see/hwcrypto/types/MemoryBufferReference.aidl +++ b/staging/security/see/hwcrypto/aidl/aidl_api/android.hardware.security.see/current/android/hardware/security/see/hwcrypto/types/MemoryBufferReference.aidl
@@ -32,6 +32,7 @@ // later when a module using the interface is updated, e.g., Mainline modules. package android.hardware.security.see.hwcrypto.types; +@RustDerive(Clone=true, Copy=true) parcelable MemoryBufferReference { int startOffset; int sizeBytes;
diff --git a/staging/security/see/hwcrypto/aidl/android/hardware/security/see/hwcrypto/types/MemoryBufferReference.aidl b/staging/security/see/hwcrypto/aidl/android/hardware/security/see/hwcrypto/types/MemoryBufferReference.aidl index 5b90d9c..1175dc5 100644 --- a/staging/security/see/hwcrypto/aidl/android/hardware/security/see/hwcrypto/types/MemoryBufferReference.aidl +++ b/staging/security/see/hwcrypto/aidl/android/hardware/security/see/hwcrypto/types/MemoryBufferReference.aidl
@@ -18,6 +18,7 @@ /* * Structure representing a section of a memory buffer. */ +@RustDerive(Copy=true, Clone=true) parcelable MemoryBufferReference { /* * Start of the memory buffer section measured from the start of the memory buffer set for this