commit ddd2d2457ffe9fd9709e2ebf6d0c26867f95747b
author Andrew Walbran <qwandor@google.com> Tue Sep 26 16:39:05 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 26 16:39:05 2023 +0000
tree 4094e893a2dc625ec25797edc02e566203b93f08
parent 93ce27b837c8d920f1fe86510bd855eb9ba57c3a
parent fcb6c4118b57a5b39663ad326df8761b77de425c

Merge "Enable Rust build of android.hardware.media.bufferpool2." into aosp-main-future

common/fmq/aidl/Android.bp

diff --git a/common/fmq/aidl/Android.bp b/common/fmq/aidl/Android.bp
index 3b022fc..6c37213 100644
--- a/common/fmq/aidl/Android.bp
+++ b/common/fmq/aidl/Android.bp
@@ -43,8 +43,9 @@
             min_sdk_version: "29",
         },
         rust: {
-            // FMQ is not supported in the rust backend
-            enabled: false,
+            // FMQ is not supported in the rust backend, but we need this AIDL interface for
+            // HardwareBuffer.
+            enabled: true,
         },
     },
     frozen: true,

media/bufferpool/aidl/Android.bp

diff --git a/media/bufferpool/aidl/Android.bp b/media/bufferpool/aidl/Android.bp
index 8caf525..8e013e0 100644
--- a/media/bufferpool/aidl/Android.bp
+++ b/media/bufferpool/aidl/Android.bp
@@ -46,6 +46,9 @@
             ],
             min_sdk_version: "29",
         },
+        rust: {
+            enabled: true,
+        },
     },
     versions_with_info: [
         {