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

Commit 147a454b authored by Kevin Rocard's avatar Kevin Rocard
Browse files

Audio: make core/4.0/default/Util.h version dependant 



This patch does not have any functional change.
It refactors Util.h to make it version dependant.
This is needed in the next patch to add a helper
that uses HIDL types.

This patch is the fixed first half of
I41204c0807d2bd4675e941771cbc9a43d7d14855
that was reverted due to a merge conflict.

Bug: 72873273
Bug: 69811500
Bug: 69010523
Test: playback and record for media and voice call
Original-Change-Id: I41204c0807d2bd4675e941771cbc9a43d7d14855
Change-Id: Ie543519fa0dca62486b75f42bb0c8a93d6cad3c3
Signed-off-by: default avatarKevin Rocard <krocard@google.com>
parent 3c50fab0

audio/core/2.0/default/Device.cpp

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include "core/2.0/default/Conversions.h"

#include "core/2.0/default/StreamIn.h"

#include "core/2.0/default/StreamOut.h"

#include "core/all-versions/default/Util.h"

#include "core/2.0/default/Util.h"



#define AUDIO_HAL_VERSION V2_0

#include <core/all-versions/default/Device.impl.h>

audio/core/2.0/default/ParametersUtil.cpp

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */



#include "core/2.0/default/ParametersUtil.h"

#include "core/2.0/default/Util.h"



#define AUDIO_HAL_VERSION V2_0

#include <core/all-versions/default/ParametersUtil.impl.h>

audio/core/2.0/default/PrimaryDevice.cpp

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#define LOG_TAG "PrimaryDeviceHAL"



#include "core/2.0/default/PrimaryDevice.h"

#include "core/all-versions/default/Util.h"

#include "core/2.0/default/Util.h"



#define AUDIO_HAL_VERSION V2_0

#include <core/all-versions/default/PrimaryDevice.impl.h>

audio/core/2.0/default/Stream.cpp

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include "core/2.0/default/Stream.h"

#include "common/all-versions/default/EffectMap.h"

#include "core/2.0/default/Conversions.h"

#include "core/2.0/default/Util.h"



#define AUDIO_HAL_VERSION V2_0

#include <core/all-versions/default/Stream.impl.h>

audio/core/2.0/default/StreamIn.cpp

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#define LOG_TAG "StreamInHAL"



#include "core/2.0/default/StreamIn.h"

#include "core/all-versions/default/Util.h"

#include "core/2.0/default/Util.h"



#define AUDIO_HAL_VERSION V2_0

#include <core/all-versions/default/StreamIn.impl.h>