commit 070e751eee408cc7d23cf6985ef796e424fcc4ba
author Kevin Rocard <krocard@google.com> Tue May 22 09:29:13 2018 -0700
committer Kevin Rocard <krocard@google.com> Mon Jun 18 14:42:45 2018 -0700
tree 2c21fe69bc93073e5c54bfcc1fe2f67c3f6cb476
parent df9b420d1a43d4fa7d75e10f00a15e482c994cae

libAudioHal: factorize V2 and V4

Merge the two versions and ifdef the few
parts still different.

Test: playback music, assistant
Change-Id: I750f5d18ba34236637c18a87e2daa54a7c446d91
Signed-off-by: Kevin Rocard <krocard@google.com>

media/libaudiohal/DevicesFactoryHalInterface.cpp

diff --git a/media/libaudiohal/DevicesFactoryHalInterface.cpp b/media/libaudiohal/DevicesFactoryHalInterface.cpp
index 9f70e4f..e631ace 100644
--- a/media/libaudiohal/DevicesFactoryHalInterface.cpp
+++ b/media/libaudiohal/DevicesFactoryHalInterface.cpp
@@ -17,8 +17,7 @@
 #include <android/hardware/audio/2.0/IDevicesFactory.h>
 #include <android/hardware/audio/4.0/IDevicesFactory.h>
 
-#include <libaudiohal/2.0/FactoryHalHidl.h>
-#include <libaudiohal/4.0/FactoryHalHidl.h>
+#include <libaudiohal/FactoryHalHidl.h>
 
 namespace android {