commit 9e79c70529c07f2157f8077f024f42fa5c9e22f9
author Dan Willemsen <dwillemsen@google.com> Wed Oct 25 22:57:10 2017 -0700
committer Dan Willemsen <dwillemsen@google.com> Thu Oct 26 15:05:46 2017 -0700
tree 690d9594c05b31b1a21ab8c5a96b9cbffc6458ff
parent fa1288bef246761a138f3e073c3e04aa84fe8a6a

Remove USE_LEGACY_LOCAL_AUDIO_HAL from libaudiohal

Bug: 64425558
Test: mmma frameworks/av/media/libaudiohal
Change-Id: I16fff7142e66fcf16fa5d07abcea9c8100539928

media/libaudiohal/DevicesFactoryHalHybrid.cpp

diff --git a/media/libaudiohal/DevicesFactoryHalHybrid.cpp b/media/libaudiohal/DevicesFactoryHalHybrid.cpp
index 454b03b..8dc1434 100644
--- a/media/libaudiohal/DevicesFactoryHalHybrid.cpp
+++ b/media/libaudiohal/DevicesFactoryHalHybrid.cpp
@@ -19,9 +19,7 @@
 
 #include "DevicesFactoryHalHybrid.h"
 #include "DevicesFactoryHalLocal.h"
-#ifndef USE_LEGACY_LOCAL_AUDIO_HAL
 #include "DevicesFactoryHalHidl.h"
-#endif
 
 namespace android {
 
@@ -32,13 +30,7 @@
 
 DevicesFactoryHalHybrid::DevicesFactoryHalHybrid()
         : mLocalFactory(new DevicesFactoryHalLocal()),
-          mHidlFactory(
-#ifdef USE_LEGACY_LOCAL_AUDIO_HAL
-                  nullptr
-#else
-                  new DevicesFactoryHalHidl()
-#endif
-                       ) {
+          mHidlFactory(new DevicesFactoryHalHidl()) {
 }
 
 DevicesFactoryHalHybrid::~DevicesFactoryHalHybrid() {