From 89c5a82aaccb98f3f0c083d1a90aa8570c66a9ba Mon Sep 17 00:00:00 2001 From: Eric Laurent Date: Wed, 17 Aug 2011 09:07:18 -0700 Subject: Create library for common audio HAL functions Moved echo reference and resampler code to audio utils library so that they can be shared by other audio HALs. Change-Id: I7ab88843cc58ecc276bc4ccbbdc826c8c0b4a430 --- libaudio/Android.mk | 23 ++++------------------- libaudio/AudioHardware.h | 4 ++-- 2 files changed, 6 insertions(+), 21 deletions(-) (limited to 'libaudio') diff --git a/libaudio/Android.mk b/libaudio/Android.mk index 3a3f615..15f8c90 100644 --- a/libaudio/Android.mk +++ b/libaudio/Android.mk @@ -1,33 +1,17 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) - -LOCAL_MODULE := libaudioutils -LOCAL_MODULE_TAGS := optional - -LOCAL_SRC_FILES:= \ - ReSampler.cpp \ - EchoReference.cpp - -LOCAL_C_INCLUDES += $(call include-path-for, speex) - -LOCAL_SHARED_LIBRARIES := libcutils - - -include $(BUILD_STATIC_LIBRARY) - -include $(CLEAR_VARS) LOCAL_SRC_FILES:= \ AudioHardware.cpp LOCAL_MODULE := audio.primary.herring LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw -LOCAL_STATIC_LIBRARIES:= libmedia_helper libaudioutils +LOCAL_STATIC_LIBRARIES:= libmedia_helper LOCAL_SHARED_LIBRARIES:= \ libutils \ libhardware_legacy \ libtinyalsa \ - libspeexresampler + libaudioutils LOCAL_WHOLE_STATIC_LIBRARIES := libaudiohw_legacy LOCAL_MODULE_TAGS := optional @@ -36,7 +20,8 @@ LOCAL_SHARED_LIBRARIES += libdl LOCAL_C_INCLUDES += $(call include-path-for, speex) LOCAL_C_INCLUDES += \ external/tinyalsa/include \ - system/media/audio_effects/include + system/media/audio_effects/include \ + system/media/audio_utils/include include $(BUILD_SHARED_LIBRARY) diff --git a/libaudio/AudioHardware.h b/libaudio/AudioHardware.h index 1fb848e..64d80ec 100644 --- a/libaudio/AudioHardware.h +++ b/libaudio/AudioHardware.h @@ -29,8 +29,8 @@ #include "secril-client.h" -#include "ReSampler.h" -#include "EchoReference.h" +#include +#include extern "C" { struct pcm; -- cgit v1.1