resolve merge conflicts of 1922726 to master
Change-Id: Ic5c6dd33569fbdae9e236fe2bf5bd30bea038cbf
diff --git a/audio_utils/Android.bp b/audio_utils/Android.bp
new file mode 100644
index 0000000..6c19504
--- /dev/null
+++ b/audio_utils/Android.bp
@@ -0,0 +1,102 @@
+subdirs = ["tests"]
+
+cc_defaults {
+ name: "audio_utils_defaults",
+
+ local_include_dirs: ["include"],
+ export_include_dirs: ["include"],
+
+ cflags: [
+ "-Werror",
+ "-Wall",
+ ],
+}
+
+cc_library {
+ name: "libaudioutils",
+ host_supported: true,
+ defaults: ["audio_utils_defaults"],
+
+ srcs: [
+ "channels.c",
+ "fifo.cpp",
+ "format.c",
+ "limiter.c",
+ "minifloat.c",
+ "primitives.c",
+ "roundup.c",
+ ],
+
+ shared_libs: [
+ "libcutils",
+ "liblog",
+ ],
+
+ target: {
+ android: {
+ srcs: [
+ "conversion.cpp",
+ "resampler.c",
+ "echo_reference.c",
+ ],
+ whole_static_libs: ["libaudioutils_fixedfft"],
+ shared_libs: [
+ "libspeexresampler",
+ ],
+ },
+ host: {
+ cflags: ["-D__unused='__attribute__((unused))'"],
+ },
+ },
+}
+
+cc_library_static {
+ name: "libaudioutils_fixedfft",
+ defaults: ["audio_utils_defaults"],
+
+ arch: {
+ arm: {
+ instruction_set: "arm",
+ },
+ },
+
+ srcs: ["fixedfft.cpp"],
+}
+
+cc_library_static {
+ name: "libsndfile",
+ defaults: ["audio_utils_defaults"],
+ host_supported: true,
+ srcs: ["tinysndfile.c"],
+ cflags: [
+ "-UHAVE_STDERR",
+ ],
+}
+
+cc_library_static {
+ name: "libfifo",
+ defaults: ["audio_utils_defaults"],
+ srcs: [
+ "fifo.cpp",
+ "primitives.c",
+ "roundup.c",
+ ],
+}
+
+cc_library_shared {
+ name: "libaudiospdif",
+ defaults: ["audio_utils_defaults"],
+
+ srcs: [
+ "spdif/BitFieldParser.cpp",
+ "spdif/FrameScanner.cpp",
+ "spdif/AC3FrameScanner.cpp",
+ "spdif/DTSFrameScanner.cpp",
+ "spdif/SPDIFEncoder.cpp",
+ ],
+
+ shared_libs: [
+ "libcutils",
+ "liblog",
+ ],
+}