Merge "Convert libaudioprocessing to Android.bp" am: b21b5ab7c6 (0c102d40) · Commits · e / os / android_frameworks_av

media/libaudioprocessing/Android.bp

0 → 100644

+54 −0

Original line number	Diff line number	Diff line
		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",
		},
		},
		}

deleted100644 → 0

+0 −40

Original line number	Diff line number	Diff line
		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))

+1 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@

		#include <audio_utils/primitives.h>
		#include <audio_utils/format.h>
		#include <external/sonic/sonic.h>
		#include <sonic.h>
		#include <media/audiohal/EffectBufferHalInterface.h>
		#include <media/audiohal/EffectHalInterface.h>
		#include <media/audiohal/EffectsFactoryHalInterface.h>

0 → 100644

+15 −0

Original line number	Diff line number	Diff line
		cc_library_shared {
		name: "libaudio-resampler",

		srcs: ["AudioResamplerCoefficients.cpp"],

		shared_libs: [
		"libutils",
		"liblog",
		],

		cflags: [
		"-Werror",
		"-Wall",
		],
		}

deleted100644 → 0

+0 −16

Original line number	Diff line number	Diff line
		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)