Merge "Convert to Android.bp"
am: 1752ac1e55
Change-Id: I06d49e11d96477898a06b61d9c5819cab1b69684
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..dd02cae
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,144 @@
+//
+// Copyright (C) 2010 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+cc_library_static {
+ name: "libspeex",
+
+ arch: {
+ arm: {
+ instruction_set: "arm",
+ },
+ },
+
+ srcs: [
+ "libspeex/mdf.c",
+ "libspeex/preprocess.c",
+ "libspeex/filterbank.c",
+ "libspeex/fftwrap.c",
+ "libspeex/smallft.c",
+ ],
+
+ cflags: [
+ "-DEXPORT=",
+ "-DFLOATING_POINT",
+ "-DUSE_SMALLFT",
+ "-DVAR_ARRAYS",
+ "-O3",
+ "-fstrict-aliasing",
+ "-fprefetch-loop-arrays",
+ "-Wno-unused-parameter",
+ ],
+
+ local_include_dirs: ["include"],
+ export_include_dirs: ["include"],
+}
+
+cc_library_shared {
+ name: "libspeexresampler",
+
+ arch: {
+ arm: {
+ instruction_set: "arm",
+
+ armv7_a_neon: {
+ cflags: ["-D_USE_NEON"],
+ },
+ },
+ },
+ srcs: ["libspeex/resample.c"],
+
+ cflags: [
+ "-DEXPORT=",
+ "-DFIXED_POINT",
+ "-DRESAMPLE_FORCE_FULL_SINC_TABLE",
+ "-O3",
+ "-fstrict-aliasing",
+ "-fprefetch-loop-arrays",
+ ],
+
+ local_include_dirs: ["include"],
+ export_include_dirs: ["include"],
+}
+
+cc_library_static {
+ name: "libspeex_googletts",
+
+ arch: {
+ arm: {
+ instruction_set: "arm",
+ },
+ },
+
+ srcs: [
+ "libspeex/bits.c",
+ "libspeex/cb_search.c",
+ "libspeex/exc_10_16_table.c",
+ "libspeex/exc_10_32_table.c",
+ "libspeex/exc_20_32_table.c",
+ "libspeex/exc_5_256_table.c",
+ "libspeex/exc_5_64_table.c",
+ "libspeex/exc_8_128_table.c",
+ "libspeex/fftwrap.c",
+ "libspeex/filterbank.c",
+ "libspeex/filters.c",
+ "libspeex/gain_table.c",
+ "libspeex/gain_table_lbr.c",
+ "libspeex/hexc_10_32_table.c",
+ "libspeex/hexc_table.c",
+ "libspeex/high_lsp_tables.c",
+ "libspeex/kiss_fft.c",
+ "libspeex/kiss_fftr.c",
+ "libspeex/lpc.c",
+ "libspeex/lsp.c",
+ "libspeex/lsp_tables_nb.c",
+ "libspeex/ltp.c",
+ "libspeex/mdf.c",
+ "libspeex/modes.c",
+ "libspeex/modes_wb.c",
+ "libspeex/nb_celp.c",
+ "libspeex/preprocess.c",
+ "libspeex/quant_lsp.c",
+ "libspeex/sb_celp.c",
+ "libspeex/smallft.c",
+ "libspeex/speex.c",
+ "libspeex/speex_callbacks.c",
+ "libspeex/speex_header.c",
+ "libspeex/vbr.c",
+ "libspeex/vq.c",
+ "libspeex/window.c",
+ "libspeex/buffer.c",
+ "libspeex/resample.c",
+ "libspeex/scal.c",
+ ],
+
+ sdk_version: "14",
+
+ cflags: [
+ "-DEXPORT=",
+ "-DFLOATING_POINT",
+ "-DUSE_SMALLFT",
+ "-DVAR_ARRAYS",
+
+ "-O3",
+ "-fstrict-aliasing",
+ "-fprefetch-loop-arrays",
+ "-Wno-unused-parameter",
+ "-Werror",
+ ],
+
+ local_include_dirs: ["include"],
+ export_include_dirs: ["include"],
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 03d0550..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,126 +0,0 @@
-#
-# Copyright (C) 2010 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_ARM_MODE := arm
-
-LOCAL_SRC_FILES := \
- libspeex/mdf.c \
- libspeex/preprocess.c \
- libspeex/filterbank.c \
- libspeex/fftwrap.c \
- libspeex/smallft.c
-
-LOCAL_MODULE:= libspeex
-
-
-
-LOCAL_CFLAGS += -DEXPORT= -DFLOATING_POINT -DUSE_SMALLFT -DVAR_ARRAYS
-LOCAL_CFLAGS += -O3 -fstrict-aliasing -fprefetch-loop-arrays
-LOCAL_CFLAGS += -Wno-unused-parameter
-
-LOCAL_C_INCLUDES += \
- $(LOCAL_PATH)/include
-
-include $(BUILD_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-
-LOCAL_ARM_MODE := arm
-
-LOCAL_SRC_FILES := \
- libspeex/resample.c
-
-LOCAL_MODULE:= libspeexresampler
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_CFLAGS += -DEXPORT= -DFIXED_POINT -DRESAMPLE_FORCE_FULL_SINC_TABLE
-LOCAL_CFLAGS += -O3 -fstrict-aliasing -fprefetch-loop-arrays
-
-ifeq ($(TARGET_ARCH),arm64)
-$(warning TODOArm64: enable neon in libspeex)
-endif
-
-ifeq ($(ARCH_ARM_HAVE_NEON),true)
-LOCAL_CFLAGS_arm += -D_USE_NEON
-endif
-
-LOCAL_C_INCLUDES += \
- $(LOCAL_PATH)/include
-
-include $(BUILD_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-
-LOCAL_ARM_MODE := arm
-
-LOCAL_SRC_FILES += \
- libspeex/bits.c \
- libspeex/cb_search.c \
- libspeex/exc_10_16_table.c \
- libspeex/exc_10_32_table.c \
- libspeex/exc_20_32_table.c \
- libspeex/exc_5_256_table.c \
- libspeex/exc_5_64_table.c \
- libspeex/exc_8_128_table.c \
- libspeex/fftwrap.c \
- libspeex/filterbank.c \
- libspeex/filters.c \
- libspeex/gain_table.c \
- libspeex/gain_table_lbr.c \
- libspeex/hexc_10_32_table.c \
- libspeex/hexc_table.c \
- libspeex/high_lsp_tables.c \
- libspeex/kiss_fft.c \
- libspeex/kiss_fftr.c \
- libspeex/lpc.c \
- libspeex/lsp.c \
- libspeex/lsp_tables_nb.c \
- libspeex/ltp.c \
- libspeex/mdf.c \
- libspeex/modes.c \
- libspeex/modes_wb.c \
- libspeex/nb_celp.c \
- libspeex/preprocess.c \
- libspeex/quant_lsp.c \
- libspeex/sb_celp.c \
- libspeex/smallft.c \
- libspeex/speex.c \
- libspeex/speex_callbacks.c \
- libspeex/speex_header.c \
- libspeex/vbr.c \
- libspeex/vq.c \
- libspeex/window.c \
- libspeex/buffer.c \
- libspeex/resample.c \
- libspeex/scal.c
-
-LOCAL_MODULE:= libspeex_googletts
-LOCAL_SDK_VERSION := 14
-
-LOCAL_CFLAGS+= -DEXPORT= -DFLOATING_POINT -DUSE_SMALLFT -DVAR_ARRAYS
-LOCAL_CFLAGS+= -O3 -fstrict-aliasing -fprefetch-loop-arrays \
- -Wno-unused-parameter -Werror
-
-LOCAL_C_INCLUDES += \
- $(LOCAL_PATH)/include
-
-include $(BUILD_STATIC_LIBRARY)
-
-
-
