[go: nahoru, domu]

Only one of the speex libraries is still in use.

Upstream appears to be abandoned ("The Speex codec has been obsoleted
by Opus. It will continue to be available, but since Opus is better
than Speex in all aspects, users are encouraged to switch"), but even
so we're on 1.2rc1 from 2008-07-23 instead of 1.2.0 from 2016-12-07...

Bug: N/A
Test: builds
Change-Id: If0efc26e350a22ac0e37ae29682c337966018745
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"],
-}