diff options
| author | Glenn Kasten <gkasten@android.com> | 2014-03-19 19:56:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-19 19:56:17 +0000 |
| commit | d09ec3b22013ef43d422c916dfd44bab9101a659 (patch) | |
| tree | ded7eec70094a054406b39d7d4a89dd3007cd115 /services | |
| parent | f4d9d45ebad478091d65b2a4c18544d308d3fff0 (diff) | |
| parent | 36817364738d4c45adc3e448fbec02a9611bfeda (diff) | |
| download | frameworks_av-d09ec3b22013ef43d422c916dfd44bab9101a659.zip frameworks_av-d09ec3b22013ef43d422c916dfd44bab9101a659.tar.gz frameworks_av-d09ec3b22013ef43d422c916dfd44bab9101a659.tar.bz2 | |
am 36817364: Merge "Add libaudioresampler"
* commit '36817364738d4c45adc3e448fbec02a9611bfeda':
Add libaudioresampler
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/Android.mk | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/services/audioflinger/Android.mk b/services/audioflinger/Android.mk index 5fcc9ba..b895027 100644 --- a/services/audioflinger/Android.mk +++ b/services/audioflinger/Android.mk @@ -19,11 +19,8 @@ LOCAL_SRC_FILES:= \ Tracks.cpp \ Effects.cpp \ AudioMixer.cpp.arm \ - AudioResampler.cpp.arm \ AudioPolicyService.cpp \ ServiceUtilities.cpp \ - AudioResamplerCubic.cpp.arm \ - AudioResamplerSinc.cpp.arm LOCAL_SRC_FILES += StateQueue.cpp @@ -32,6 +29,7 @@ LOCAL_C_INCLUDES := \ $(call include-path-for, audio-utils) LOCAL_SHARED_LIBRARIES := \ + libaudioresampler \ libaudioutils \ libcommon_time_client \ libcutils \ @@ -43,7 +41,6 @@ LOCAL_SHARED_LIBRARIES := \ libhardware \ libhardware_legacy \ libeffects \ - libdl \ libpowermanager LOCAL_STATIC_LIBRARIES := \ @@ -76,15 +73,9 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES:= \ test-resample.cpp \ - AudioResampler.cpp.arm \ - AudioResamplerCubic.cpp.arm \ - AudioResamplerSinc.cpp.arm LOCAL_SHARED_LIBRARIES := \ - libdl \ - libcutils \ - libutils \ - liblog + libaudioresampler \ LOCAL_MODULE:= test-resample @@ -92,4 +83,20 @@ LOCAL_MODULE_TAGS := optional include $(BUILD_EXECUTABLE) +include $(CLEAR_VARS) + +LOCAL_SRC_FILES:= \ + AudioResampler.cpp.arm \ + AudioResamplerCubic.cpp.arm \ + AudioResamplerSinc.cpp.arm + +LOCAL_SHARED_LIBRARIES := \ + libcutils \ + libdl \ + liblog + +LOCAL_MODULE := libaudioresampler + +include $(BUILD_SHARED_LIBRARY) + include $(call all-makefiles-under,$(LOCAL_PATH)) |