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 | |
| 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.
| -rw-r--r-- | services/audioflinger/Android.mk | 14 | ||||
| -rw-r--r-- | services/audiopolicy/Android.mk | 6 | ||||
| -rw-r--r-- | services/soundtrigger/Android.mk | 4 |
3 files changed, 14 insertions, 10 deletions
diff --git a/services/audioflinger/Android.mk b/services/audioflinger/Android.mk index 697fb37..f0196c6 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) @@ -51,13 +57,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 diff --git a/services/audiopolicy/Android.mk b/services/audiopolicy/Android.mk index 6512c38..188fc89 100644 --- a/services/audiopolicy/Android.mk +++ b/services/audiopolicy/Android.mk @@ -30,7 +30,8 @@ LOCAL_SHARED_LIBRARIES := \ libbinder \ libmedia \ libhardware \ - libhardware_legacy + libhardware_legacy \ + libserviceutility ifneq ($(USE_LEGACY_AUDIO_POLICY), 1) LOCAL_SHARED_LIBRARIES += \ @@ -38,8 +39,7 @@ LOCAL_SHARED_LIBRARIES += \ endif LOCAL_STATIC_LIBRARIES := \ - libmedia_helper \ - libserviceutility + libmedia_helper LOCAL_MODULE:= libaudiopolicyservice 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 += \ |