commit 6891d7ec28761db85c8d4c486fe105ee64a2bd04
author Kevin Rocard <krocard@google.com> Thu Dec 14 18:39:39 2017 -0800
committer Kevin Rocard <krocard@google.com> Sat Jan 20 10:49:57 2018 -0800
tree ad84787174a757ed13b28956683fd98b39855361
parent 649142becc2e03ba09490cad133740cc1271ed84

Audio V4: Make common helper version independent

The implementation uses the version provided by macro.

Bug: 38184704
Test: compile
Change-Id: Ib5565bdf77ed9e42fc8271a4317eb88681aefcd5
Signed-off-by: Kevin Rocard <krocard@google.com>

audio/2.0/default/Android.mk

diff --git a/audio/2.0/default/Android.mk b/audio/2.0/default/Android.mk
index 7f42abe..ccf3c1c 100644
--- a/audio/2.0/default/Android.mk
+++ b/audio/2.0/default/Android.mk
@@ -44,6 +44,7 @@
     android.hardware.audio@2.0 \
     android.hardware.audio.common@2.0 \
     android.hardware.audio.common@2.0-util \
+    android.hardware.audio.common-util \
 
 LOCAL_HEADER_LIBRARIES := \
     libaudioclient_headers \

audio/2.0/default/Device.cpp

diff --git a/audio/2.0/default/Device.cpp b/audio/2.0/default/Device.cpp
index 3727966..c392f65 100644
--- a/audio/2.0/default/Device.cpp
+++ b/audio/2.0/default/Device.cpp
@@ -30,6 +30,8 @@
 #include "StreamOut.h"
 #include "Util.h"
 
+using ::android::hardware::audio::common::V2_0::HidlUtils;
+
 namespace android {
 namespace hardware {
 namespace audio {

audio/2.0/default/Stream.cpp

diff --git a/audio/2.0/default/Stream.cpp b/audio/2.0/default/Stream.cpp
index effdd28..2fb47ef 100644
--- a/audio/2.0/default/Stream.cpp
+++ b/audio/2.0/default/Stream.cpp
@@ -26,8 +26,8 @@
 #include <utils/Vector.h>
 
 #include "Conversions.h"
-#include "EffectMap.h"
 #include "Stream.h"
+#include "common/all-versions/default/EffectMap.h"
 
 namespace android {
 namespace hardware {