summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Andrew Walbran <qwandor@google.com> 2023-10-19 22:43:30 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-19 22:43:30 +0000
commit3aeab9b6b130a95592f0a9a8aa1b6b2ba3baf4e6 (patch)
treecdf2bacddee6c47c950de4135ed0821531463792
parent31ce88b1041925948f3645dc24fb553ca84a4a6d (diff)
parent7cd9b040fc68556b2e7eceeee9daffdabdfd40a1 (diff)
Merge "Support HardwareBuffer in Rust." into main am: 7cd9b040fc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2736373 Change-Id: I501baed6c1221b77709e6fc43be52f49af5dbab9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--core/java/android/hardware/HardwareBuffer.aidl2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/hardware/HardwareBuffer.aidl b/core/java/android/hardware/HardwareBuffer.aidl
index 1333f0da725f..a9742cb6c084 100644
--- a/core/java/android/hardware/HardwareBuffer.aidl
+++ b/core/java/android/hardware/HardwareBuffer.aidl
@@ -16,4 +16,4 @@
package android.hardware;
-@JavaOnlyStableParcelable @NdkOnlyStableParcelable parcelable HardwareBuffer ndk_header "android/hardware_buffer_aidl.h";
+@JavaOnlyStableParcelable @NdkOnlyStableParcelable @RustOnlyStableParcelable parcelable HardwareBuffer ndk_header "android/hardware_buffer_aidl.h" rust_type "nativewindow::HardwareBuffer";