summaryrefslogtreecommitdiffstats
path: root/libaudio
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2011-08-17 09:07:18 -0700
committerEric Laurent <elaurent@google.com>2011-08-18 12:30:00 -0700
commit89c5a82aaccb98f3f0c083d1a90aa8570c66a9ba (patch)
tree51e61daf0e50e5cca79672f01f2976c2584be26b /libaudio
parent6a4e3eaae7232c607aa19c8fc376fb1e894eb413 (diff)
downloaddevice_samsung_crespo-89c5a82aaccb98f3f0c083d1a90aa8570c66a9ba.zip
device_samsung_crespo-89c5a82aaccb98f3f0c083d1a90aa8570c66a9ba.tar.gz
device_samsung_crespo-89c5a82aaccb98f3f0c083d1a90aa8570c66a9ba.tar.bz2
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
Diffstat (limited to 'libaudio')
-rw-r--r--libaudio/Android.mk23
-rw-r--r--libaudio/AudioHardware.h4
2 files changed, 6 insertions, 21 deletions
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 <audio_utils/ReSampler.h>
+#include <audio_utils/EchoReference.h>
extern "C" {
struct pcm;