2 files changed, 18 insertions, 0 deletions
diff --git a/media/mediaserver/Android.mk b/media/mediaserver/Android.mk
index 7e017b9..ac25582 100644
--- a/media/mediaserver/Android.mk
+++ b/media/mediaserver/Android.mk
@@ -51,6 +51,16 @@ LOCAL_C_INCLUDES := \
     frameworks/av/services/radio \
     external/sonic
 
+ifneq ($(BOARD_NUMBER_OF_CAMERAS),)
+    LOCAL_CFLAGS += -DMAX_CAMERAS=$(BOARD_NUMBER_OF_CAMERAS)
+endif
+
+ifeq ($(strip $(AUDIO_FEATURE_ENABLED_LISTEN)),true)
+  LOCAL_SHARED_LIBRARIES += liblisten
+  LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/mm-audio/audio-listen
+  LOCAL_CFLAGS += -DAUDIO_LISTEN_ENABLED
+endif
+
 LOCAL_MODULE:= mediaserver
 LOCAL_32_BIT_ONLY := true
 
diff --git a/media/mediaserver/main_mediaserver.cpp b/media/mediaserver/main_mediaserver.cpp
index 8cc9508..f785c0d 100644
--- a/media/mediaserver/main_mediaserver.cpp
+++ b/media/mediaserver/main_mediaserver.cpp
@@ -40,6 +40,10 @@
 #include "SoundTriggerHwService.h"
 #include "RadioService.h"
 
+#ifdef AUDIO_LISTEN_ENABLED
+#include "ListenService.h"
+#endif
+
 using namespace android;
 
 int main(int argc __unused, char** argv)
@@ -139,6 +143,10 @@ int main(int argc __unused, char** argv)
         MediaPlayerService::instantiate();
         ResourceManagerService::instantiate();
         CameraService::instantiate();
+#ifdef AUDIO_LISTEN_ENABLED
+        ALOGI("ListenService instantiated");
+        ListenService::instantiate();
+#endif
         AudioPolicyService::instantiate();
         SoundTriggerHwService::instantiate();
         RadioService::instantiate();