From 9c99f15f442bd22b9846cb4b39bc54c13dde42b3 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Fri, 16 Nov 2018 15:30:38 -0800 Subject: [PATCH] Convert libaudioprocessing to Android.bp See build/soong/README.md for more information Test: cd frameworks/av/media/libaudioprocessing; mma Test: atest resampler_tests Change-Id: Icae927b3d4692f7cf15b296e6bf5529329b22325 --- media/libaudioprocessing/Android.bp | 54 +++++++++++ media/libaudioprocessing/Android.mk | 40 -------- media/libaudioprocessing/BufferProviders.cpp | 2 +- .../audio-resampler/Android.bp | 15 +++ .../audio-resampler/Android.mk | 16 ---- media/libaudioprocessing/tests/Android.bp | 51 ++++++++++ media/libaudioprocessing/tests/Android.mk | 93 ------------------- 7 files changed, 121 insertions(+), 150 deletions(-) create mode 100644 media/libaudioprocessing/Android.bp delete mode 100644 media/libaudioprocessing/Android.mk create mode 100644 media/libaudioprocessing/audio-resampler/Android.bp delete mode 100644 media/libaudioprocessing/audio-resampler/Android.mk create mode 100644 media/libaudioprocessing/tests/Android.bp delete mode 100644 media/libaudioprocessing/tests/Android.mk diff --git a/media/libaudioprocessing/Android.bp b/media/libaudioprocessing/Android.bp new file mode 100644 index 0000000000..817fb0b4d5 --- /dev/null +++ b/media/libaudioprocessing/Android.bp @@ -0,0 +1,54 @@ +cc_defaults { + name: "libaudioprocessing_defaults", + + export_include_dirs: ["include"], + + shared_libs: [ + "libaudiohal", + "libaudioutils", + "libcutils", + "liblog", + "libnbaio", + "libnblog", + "libsonic", + "libutils", + ], + + cflags: [ + "-Werror", + "-Wall", + + // uncomment to disable NEON on architectures that actually do support NEON, for benchmarking + // "-DUSE_NEON=false", + ], +} + +cc_library_shared { + name: "libaudioprocessing", + defaults: ["libaudioprocessing_defaults"], + + srcs: [ + "BufferProviders.cpp", + "RecordBufferConverter.cpp", + ], + whole_static_libs: ["libaudioprocessing_arm"], +} + +cc_library_static { + name: "libaudioprocessing_arm", + defaults: ["libaudioprocessing_defaults"], + + srcs: [ + "AudioMixer.cpp", + "AudioResampler.cpp", + "AudioResamplerCubic.cpp", + "AudioResamplerSinc.cpp", + "AudioResamplerDyn.cpp", + ], + + arch: { + arm: { + instruction_set: "arm", + }, + }, +} diff --git a/media/libaudioprocessing/Android.mk b/media/libaudioprocessing/Android.mk deleted file mode 100644 index da1ecc2042..0000000000 --- a/media/libaudioprocessing/Android.mk +++ /dev/null @@ -1,40 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - AudioMixer.cpp.arm \ - AudioResampler.cpp.arm \ - AudioResamplerCubic.cpp.arm \ - AudioResamplerSinc.cpp.arm \ - AudioResamplerDyn.cpp.arm \ - BufferProviders.cpp \ - RecordBufferConverter.cpp \ - -LOCAL_C_INCLUDES := \ - $(TOP) \ - $(call include-path-for, audio-utils) \ - $(LOCAL_PATH)/include \ - -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include - -LOCAL_SHARED_LIBRARIES := \ - libaudiohal \ - libaudioutils \ - libcutils \ - liblog \ - libnbaio \ - libnblog \ - libsonic \ - libutils \ - -LOCAL_MODULE := libaudioprocessing - -LOCAL_CFLAGS := -Werror -Wall - -# uncomment to disable NEON on architectures that actually do support NEON, for benchmarking -#LOCAL_CFLAGS += -DUSE_NEON=false - -include $(BUILD_SHARED_LIBRARY) - -include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/media/libaudioprocessing/BufferProviders.cpp b/media/libaudioprocessing/BufferProviders.cpp index 2d9e1cb16b..d60560bb8e 100644 --- a/media/libaudioprocessing/BufferProviders.cpp +++ b/media/libaudioprocessing/BufferProviders.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/media/libaudioprocessing/audio-resampler/Android.bp b/media/libaudioprocessing/audio-resampler/Android.bp new file mode 100644 index 0000000000..dc703106cf --- /dev/null +++ b/media/libaudioprocessing/audio-resampler/Android.bp @@ -0,0 +1,15 @@ +cc_library_shared { + name: "libaudio-resampler", + + srcs: ["AudioResamplerCoefficients.cpp"], + + shared_libs: [ + "libutils", + "liblog", + ], + + cflags: [ + "-Werror", + "-Wall", + ], +} diff --git a/media/libaudioprocessing/audio-resampler/Android.mk b/media/libaudioprocessing/audio-resampler/Android.mk deleted file mode 100644 index bb2807c330..0000000000 --- a/media/libaudioprocessing/audio-resampler/Android.mk +++ /dev/null @@ -1,16 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - AudioResamplerCoefficients.cpp - -LOCAL_MODULE := libaudio-resampler - -LOCAL_MODULE_TAGS := optional - -LOCAL_SHARED_LIBRARIES := libutils liblog - -LOCAL_CFLAGS += -Werror -Wall - -include $(BUILD_SHARED_LIBRARY) diff --git a/media/libaudioprocessing/tests/Android.bp b/media/libaudioprocessing/tests/Android.bp new file mode 100644 index 0000000000..811c16b8d9 --- /dev/null +++ b/media/libaudioprocessing/tests/Android.bp @@ -0,0 +1,51 @@ +// Build the unit tests for libaudioprocessing + +cc_defaults { + name: "libaudioprocessing_test_defaults", + + header_libs: ["libbase_headers"], + shared_libs: [ + "libaudioutils", + "libaudioprocessing", + "libcutils", + "liblog", + "libutils", + ], + + cflags: [ + "-Werror", + "-Wall", + ], +} + +// +// resampler unit test +// +cc_test { + name: "resampler_tests", + defaults: ["libaudioprocessing_test_defaults"], + + srcs: ["resampler_tests.cpp"], +} + +// +// audio mixer test tool +// +cc_binary { + name: "test-mixer", + defaults: ["libaudioprocessing_test_defaults"], + + srcs: ["test-mixer.cpp"], + static_libs: ["libsndfile"], +} + +// +// build audio resampler test tool +// +cc_binary { + name: "test-resampler", + defaults: ["libaudioprocessing_test_defaults"], + + srcs: ["test-resampler.cpp"], + static_libs: ["libsndfile"], +} diff --git a/media/libaudioprocessing/tests/Android.mk b/media/libaudioprocessing/tests/Android.mk deleted file mode 100644 index 31ffbdc05c..0000000000 --- a/media/libaudioprocessing/tests/Android.mk +++ /dev/null @@ -1,93 +0,0 @@ -# Build the unit tests for libaudioprocessing - -LOCAL_PATH := $(call my-dir) - -# -# resampler unit test -# -include $(CLEAR_VARS) - -LOCAL_SHARED_LIBRARIES := \ - libaudioutils \ - libaudioprocessing \ - libcutils \ - liblog \ - libutils \ - -LOCAL_C_INCLUDES := \ - $(call include-path-for, audio-utils) \ - -LOCAL_SRC_FILES := \ - resampler_tests.cpp - -LOCAL_HEADER_LIBRARIES := libbase_headers - -LOCAL_MODULE := resampler_tests - -LOCAL_MODULE_TAGS := tests - -LOCAL_CFLAGS := -Werror -Wall - -include $(BUILD_NATIVE_TEST) - -# -# audio mixer test tool -# -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - test-mixer.cpp \ - -LOCAL_C_INCLUDES := \ - $(call include-path-for, audio-utils) \ - -LOCAL_STATIC_LIBRARIES := \ - libsndfile \ - -LOCAL_SHARED_LIBRARIES := \ - libaudioprocessing \ - libaudioutils \ - libcutils \ - liblog \ - libutils \ - -LOCAL_HEADER_LIBRARIES := libbase_headers - -LOCAL_MODULE := test-mixer - -LOCAL_MODULE_TAGS := optional - -LOCAL_CFLAGS := -Werror -Wall - -include $(BUILD_EXECUTABLE) - -# -# build audio resampler test tool -# -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - test-resampler.cpp \ - -LOCAL_C_INCLUDES := \ - $(call include-path-for, audio-utils) \ - -LOCAL_STATIC_LIBRARIES := \ - libsndfile \ - -LOCAL_SHARED_LIBRARIES := \ - libaudioprocessing \ - libaudioutils \ - libcutils \ - liblog \ - libutils \ - -LOCAL_HEADER_LIBRARIES := libbase_headers - -LOCAL_MODULE := test-resampler - -LOCAL_MODULE_TAGS := optional - -LOCAL_CFLAGS := -Werror -Wall - -include $(BUILD_EXECUTABLE)