diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2014-11-06 17:49:48 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2014-11-06 17:49:48 -0800 |
| commit | e1a2df553a6d151807a5da738a3cd853bef908d9 (patch) | |
| tree | 9015c1c9ad9ec69f1962657f70fe3df386fbb05a /media/mediaserver/Android.mk | |
| parent | bcf093bfef277a8ec0119da9e84e5abac58ad0b1 (diff) | |
| parent | 841daebc75fbf5e7fb4dd71cab559b8f4d7150ae (diff) | |
| download | frameworks_av-e1a2df553a6d151807a5da738a3cd853bef908d9.zip frameworks_av-e1a2df553a6d151807a5da738a3cd853bef908d9.tar.gz frameworks_av-e1a2df553a6d151807a5da738a3cd853bef908d9.tar.bz2 | |
Resolve conflict
Diffstat (limited to 'media/mediaserver/Android.mk')
| -rw-r--r-- | media/mediaserver/Android.mk | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/media/mediaserver/Android.mk b/media/mediaserver/Android.mk index d07bc99..3a280f0 100644 --- a/media/mediaserver/Android.mk +++ b/media/mediaserver/Android.mk @@ -15,6 +15,8 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := \ libaudioflinger \ + libaudiopolicyservice \ + libcamera_metadata\ libcameraservice \ libmedialogservice \ libcutils \ @@ -23,7 +25,8 @@ LOCAL_SHARED_LIBRARIES := \ libmediaplayerservice \ libutils \ liblog \ - libbinder + libbinder \ + libsoundtriggerservice LOCAL_STATIC_LIBRARIES := \ libregistermsext @@ -32,7 +35,10 @@ LOCAL_C_INCLUDES := \ frameworks/av/media/libmediaplayerservice \ frameworks/av/services/medialog \ frameworks/av/services/audioflinger \ - frameworks/av/services/camera/libcameraservice + frameworks/av/services/audiopolicy \ + frameworks/av/services/camera/libcameraservice \ + $(call include-path-for, audio-utils) \ + frameworks/av/services/soundtrigger LOCAL_MODULE:= mediaserver LOCAL_32_BIT_ONLY := true |