From fcb6c4118b57a5b39663ad326df8761b77de425c Mon Sep 17 00:00:00 2001
From: Andrew Walbran <qwandor@google.com>
Date: Thu, 14 Sep 2023 15:44:57 +0000
Subject: [PATCH] Enable Rust build of android.hardware.media.bufferpool2.

This is a prerequisite for android.hardware.media.c2, which I'm
splitting out to a separate CL to simplify merging.

Bug: 295245772
Change-Id: I1ab9ed45b0b500065c0f18b810c3aa266878b80f
---
 common/fmq/aidl/Android.bp       | 5 +++--
 media/bufferpool/aidl/Android.bp | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/common/fmq/aidl/Android.bp b/common/fmq/aidl/Android.bp
index 3b022fcb65..6c37213005 100644
--- a/common/fmq/aidl/Android.bp
+++ b/common/fmq/aidl/Android.bp
@@ -43,8 +43,9 @@ aidl_interface {
             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,
diff --git a/media/bufferpool/aidl/Android.bp b/media/bufferpool/aidl/Android.bp
index 8caf525ffe..8e013e0535 100644
--- a/media/bufferpool/aidl/Android.bp
+++ b/media/bufferpool/aidl/Android.bp
@@ -46,6 +46,9 @@ aidl_interface {
             ],
             min_sdk_version: "29",
         },
+        rust: {
+            enabled: true,
+        },
     },
     versions_with_info: [
         {