Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04b743e2 authored by Jayant Chowdhary's avatar Jayant Chowdhary Committed by Automerger Merge Worker
Browse files

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

Merge "Support cpp backend for fmq in aidl (POD types only)" into main am: e8c4d824 am: 6f1e2b96

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3343312



Change-Id: I8057618e872b5db9ff19a56e84c0642ec9738a41
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 17b08964 6f1e2b96

common/aidl/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ aidl_interface { 
            ],

        },

        cpp: {

            enabled: false,

            enabled: true,

        },

        ndk: {

            apex_available: [

common/fmq/aidl/Android.bp

+2 −3
Original line number Diff line number Diff line
@@ -28,9 +28,8 @@ aidl_interface { 
            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: [