Merge commit 'd823ab13bdbf58d36ff74481842aa1d1673f9ac7' into HEAD
Change-Id: I1e3c00c525a6b82ea7c94bcb0a0eebdae0615c0f
diff --git a/Android.bp b/Android.bp
index 0fe822a..f66394a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,40 +14,6 @@
// 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",
- "-Wall",
- "-Werror",
- "-Wno-unused-parameter",
- ],
-
- local_include_dirs: ["include"],
- export_include_dirs: ["include"],
-}
-
cc_library_shared {
name: "libspeexresampler",
@@ -82,73 +48,3 @@
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"],
-}
