diff options
| author | Chong Zhang <chz@google.com> | 2015-01-07 19:25:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-07 19:25:00 +0000 |
| commit | 78c02ddb6bf0d676160244a62c11dceb68301b73 (patch) | |
| tree | b985df2fc3985bfe5589cb6955ed3369d7d9feef /services/soundtrigger | |
| parent | 6ab33981d45cd69e683a143fec6530e66bd3e371 (diff) | |
| parent | cfa5bf04ff250a14b11a75bcfa35ee2d6dbab4e9 (diff) | |
| download | frameworks_av-78c02ddb6bf0d676160244a62c11dceb68301b73.zip frameworks_av-78c02ddb6bf0d676160244a62c11dceb68301b73.tar.gz frameworks_av-78c02ddb6bf0d676160244a62c11dceb68301b73.tar.bz2 | |
am cfa5bf04: Merge "make libserviceutility a shared lib" into lmp-mr1-dev
* commit 'cfa5bf04ff250a14b11a75bcfa35ee2d6dbab4e9':
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/soundtrigger')
| -rw-r--r-- | services/soundtrigger/Android.mk | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/services/soundtrigger/Android.mk b/services/soundtrigger/Android.mk index 572ae56..ecc49ae 100644 --- a/services/soundtrigger/Android.mk +++ b/services/soundtrigger/Android.mk @@ -32,9 +32,7 @@ LOCAL_SHARED_LIBRARIES:= \ libcutils \ libhardware \ libsoundtrigger \ - libmedia - -LOCAL_STATIC_LIBRARIES := \ + libmedia \ libserviceutility LOCAL_C_INCLUDES += \ |