commit e8c4d8246f4e213b9579b8be4e1097c926ba6d93
author Jayant Chowdhary <jchowdhary@google.com> Sat Nov 23 05:11:57 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Nov 23 05:11:57 2024 +0000
tree 1dafb95bf79840dbc9f3aa8b3f05cd6ec36f8fdd
parent b7ba9a5d5c743601fca31205d59222bb3b32f2cf
parent 2aeb12356e06c85bb6334356c087d9e2fd12d22f

Merge "Support cpp backend for fmq in aidl (POD types only)" into main

common/aidl/Android.bp

diff --git a/common/aidl/Android.bp b/common/aidl/Android.bp
index 904a3d9..0ce52e7 100644
--- a/common/aidl/Android.bp
+++ b/common/aidl/Android.bp
@@ -26,7 +26,7 @@
             ],
         },
         cpp: {
-            enabled: false,
+            enabled: true,
         },
         ndk: {
             apex_available: [

common/fmq/aidl/Android.bp

diff --git a/common/fmq/aidl/Android.bp b/common/fmq/aidl/Android.bp
index 4a3658e..7fb6368 100644
--- a/common/fmq/aidl/Android.bp
+++ b/common/fmq/aidl/Android.bp
@@ -28,9 +28,8 @@
             sdk_version: "module_current",
         },
         cpp: {
-            // FMQ will not be supported in the cpp backend because the parcelables
-            // are not stable enough for use in shared memory
-            enabled: false,
+            // FMQ is only supported for PODs with the cpp backend
+            enabled: true,
         },
         ndk: {
             apex_available: [