diff options
author | Eric Laurent <elaurent@google.com> | 2014-06-05 15:32:53 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-05 15:32:54 +0000 |
commit | 4fa0bb24d51a8af69db9796f909fee6b61428cf4 (patch) | |
tree | 2633c0de5a3851bdc783bf233377d7c524bb9558 /media | |
parent | 03873edded28f88b5bdbe44fbf2e5ca071c6f10e (diff) | |
parent | b7a11d83f749ad0200778c4815e907d011d4b5d3 (diff) | |
download | frameworks_av-4fa0bb24d51a8af69db9796f909fee6b61428cf4.zip frameworks_av-4fa0bb24d51a8af69db9796f909fee6b61428cf4.tar.gz frameworks_av-4fa0bb24d51a8af69db9796f909fee6b61428cf4.tar.bz2 |
Merge "add sound trigger native service"
Diffstat (limited to 'media')
-rw-r--r-- | media/mediaserver/Android.mk | 6 | ||||
-rw-r--r-- | media/mediaserver/main_mediaserver.cpp | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/media/mediaserver/Android.mk b/media/mediaserver/Android.mk index 786bf0d..3a280f0 100644 --- a/media/mediaserver/Android.mk +++ b/media/mediaserver/Android.mk @@ -25,7 +25,8 @@ LOCAL_SHARED_LIBRARIES := \ libmediaplayerservice \ libutils \ liblog \ - libbinder + libbinder \ + libsoundtriggerservice LOCAL_STATIC_LIBRARIES := \ libregistermsext @@ -36,7 +37,8 @@ LOCAL_C_INCLUDES := \ frameworks/av/services/audioflinger \ frameworks/av/services/audiopolicy \ frameworks/av/services/camera/libcameraservice \ - $(call include-path-for, audio-utils) + $(call include-path-for, audio-utils) \ + frameworks/av/services/soundtrigger LOCAL_MODULE:= mediaserver LOCAL_32_BIT_ONLY := true diff --git a/media/mediaserver/main_mediaserver.cpp b/media/mediaserver/main_mediaserver.cpp index a347951..af1c9e6 100644 --- a/media/mediaserver/main_mediaserver.cpp +++ b/media/mediaserver/main_mediaserver.cpp @@ -34,6 +34,7 @@ #include "MediaLogService.h" #include "MediaPlayerService.h" #include "AudioPolicyService.h" +#include "SoundTriggerHwService.h" using namespace android; @@ -128,6 +129,7 @@ int main(int argc __unused, char** argv) MediaPlayerService::instantiate(); CameraService::instantiate(); AudioPolicyService::instantiate(); + SoundTriggerHwService::instantiate(); registerExtensions(); ProcessState::self()->startThreadPool(); IPCThreadState::self()->joinThreadPool(); |