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

Commit 893b7c23 authored by Mikhail Naganov's avatar Mikhail Naganov
Browse files

Allow CPP<->legacy and NDK<->legacy to coexist in the same module 

Introduce BACKEND_CPP_NDK define for modules that need to use
both CPP<->legacy and NDK<->legacy converters, for example,
to bridge CPP and NDK types, as in libaudiohal@aidl.

Restructure AidlConversion* headers to support this.
Also, brush up some headers for better compliance to the style
guide.

Note that in modules that import both conversion packages,
"legacy2aidl" functions need to be called using a fully qualified
name to avoid ambiguities since the CPP and NDK backend versions
only differ by the return type.

Bug: 205884982
Test: m
Change-Id: Iec35c73563459cde60a5c0265a0c8d0ef1fc5fbd
parent 19418e32

media/audioaidlconversion/AidlConversionCppNdk.cpp

+3 −0
Original line number Diff line number Diff line
@@ -43,6 +43,9 @@ namespace android { 


using ::android::BAD_VALUE;

using ::android::OK;

using ::android::String16;

using ::android::String8;

using ::android::status_t;

using ::android::base::unexpected;



using media::audio::common::AudioChannelLayout;

media/audioaidlconversion/AidlConversionEffect.cpp

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ using ::aidl::android::media::audio::common::AudioDeviceDescription; 


using ::android::BAD_VALUE;

using ::android::OK;

using ::android::status_t;

using ::android::base::unexpected;

using ::android::effect::utils::EffectParamReader;

using ::android::effect::utils::EffectParamWriter;

media/audioaidlconversion/include/media/AidlConversionCppNdk-impl.h

0 → 100644
+433 −0

File added.

Preview size limit exceeded, changes collapsed.

media/audioaidlconversion/include/media/AidlConversionCppNdk.h

+10 −403

File changed.

Preview size limit exceeded, changes collapsed.

media/audioaidlconversion/include/media/AidlConversionUtil-impl.h

0 → 100644
+438 −0

File added.

Preview size limit exceeded, changes collapsed.