diff options
| -rw-r--r-- | CleanSpec.mk | 1 | ||||
| -rw-r--r-- | device_base.mk | 3 | ||||
| -rw-r--r-- | libaudio/Android.mk | 23 | ||||
| -rw-r--r-- | libaudio/AudioHardware.h | 4 |
4 files changed, 9 insertions, 22 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 9bf8c6f..39a44eb 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -64,3 +64,4 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/product/crespo/obj/lib/camera.s5 $(call add-clean-step, rm -rf $(OUT_DIR)/target/product/crespo/obj/SHARED_LIBRARIES/camera.s5pc110_intermediates/LINKED/camera.s5pc110.so) $(call add-clean-step, rm -rf $(OUT_DIR)/target/product/crespo/symbols/system/lib/hw/camera.s5pc110.so) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Tag.apk) +$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/crespo/obj/STATIC_LIBRARIES/libaudioutils_intermediates) diff --git a/device_base.mk b/device_base.mk index e44ee58..d9404e6 100644 --- a/device_base.mk +++ b/device_base.mk @@ -117,7 +117,8 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ audio_policy.herring \ audio.primary.herring \ - audio.a2dp.default + audio.a2dp.default \ + libaudioutils # Libs PRODUCT_PACKAGES += \ 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; |