diff options
| author | Chong Zhang <chz@google.com> | 2015-01-07 20:37:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-07 20:37:49 +0000 |
| commit | 36d560b1f1146da34016744bb7a72b2f4f348c9d (patch) | |
| tree | 4a6a6ff797c152731c35426af06feb8e47f0170a /services/audioflinger | |
| parent | e6910780274fb818f1432d10672af4b813c2bc59 (diff) | |
| parent | 27a78b56e1cf9814971192883cb7d15c186465f7 (diff) | |
| download | frameworks_av-36d560b1f1146da34016744bb7a72b2f4f348c9d.zip frameworks_av-36d560b1f1146da34016744bb7a72b2f4f348c9d.tar.gz frameworks_av-36d560b1f1146da34016744bb7a72b2f4f348c9d.tar.bz2 | |
am 27a78b56: am 78c02ddb: am cfa5bf04: Merge "make libserviceutility a shared lib" into lmp-mr1-dev
* commit '27a78b56e1cf9814971192883cb7d15c186465f7':
make libserviceutility a shared lib
audio policy: fix remote mic capture
audio policy: suppport for dynamic source
Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitions
Fix race condition in signaling completion for decode.
AnotherPacketSource: need reset some members before returning from queueDiscontinuity().
Fix looping sound playback
AnotherPacketSource.cpp: Do not queue discontinity signal buffer resulted from seek.
Diffstat (limited to 'services/audioflinger')
| -rw-r--r-- | services/audioflinger/Android.mk | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/services/audioflinger/Android.mk b/services/audioflinger/Android.mk index f3290c6..44d2553 100644 --- a/services/audioflinger/Android.mk +++ b/services/audioflinger/Android.mk @@ -19,7 +19,13 @@ LOCAL_SRC_FILES := \ # FIXME Move this library to frameworks/native LOCAL_MODULE := libserviceutility -include $(BUILD_STATIC_LIBRARY) +LOCAL_SHARED_LIBRARIES := \ + libcutils \ + libutils \ + liblog \ + libbinder + +include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) @@ -57,13 +63,13 @@ LOCAL_SHARED_LIBRARIES := \ libhardware \ libhardware_legacy \ libeffects \ - libpowermanager + libpowermanager \ + libserviceutility LOCAL_STATIC_LIBRARIES := \ libscheduling_policy \ libcpustats \ - libmedia_helper \ - libserviceutility + libmedia_helper LOCAL_MODULE:= libaudioflinger LOCAL_32_BIT_ONLY := true |