aboutsummaryrefslogtreecommitdiff
path: root/Android.bp
diff options
context:
space:
mode:
authorFelicia Lim <flim@google.com>2018-11-06 12:35:39 -0800
committerRay Essick <essick@google.com>2018-11-14 21:29:18 +0000
commit0efcc2be1f988603f8239310e88da2a9623347c8 (patch)
tree13c7c0f8e05918858ebaa13510d80f8369884b57 /Android.bp
parentcf168b63a5c4766bcb663d9ddb16dadbc080e103 (diff)
downloadlibopus-0efcc2be1f988603f8239310e88da2a9623347c8.tar.gz
Bug: 63932386 Test: - verified builds for arm*/x86* - checked functionality using an emulator and stagefright Change-Id: I10c4b267be1c846d8992e3c5f6d2576c2cb258a9 Signed-off-by: Felicia Lim <flim@google.com>
Diffstat (limited to 'Android.bp')
-rw-r--r--Android.bp33
1 files changed, 19 insertions, 14 deletions
diff --git a/Android.bp b/Android.bp
index 82f6a7ca..fc6ddd40 100644
--- a/Android.bp
+++ b/Android.bp
@@ -140,12 +140,15 @@ cc_library_shared {
"silk/fixed/schur_FIX.c",
// OPUS_SOURCES
+ "src/mapping_matrix.c",
"src/opus.c",
"src/opus_decoder.c",
"src/opus_encoder.c",
"src/opus_multistream.c",
"src/opus_multistream_encoder.c",
"src/opus_multistream_decoder.c",
+ "src/opus_projection_encoder.c",
+ "src/opus_projection_decoder.c",
"src/repacketizer.c",
// OPUS_SOURCES_FLOAT
@@ -167,6 +170,7 @@ cc_library_shared {
"-DUSE_ALLOCA",
"-DHAVE_LRINT",
"-DHAVE_LRINTF",
+ "-DENABLE_HARDENING",
"-O2",
"-fno-math-errno",
"-Wall",
@@ -261,19 +265,19 @@ cc_library_shared {
sse4_1: {
srcs: [
// CELT_SOURCES_SSE4_1
- "celt/x86/celt_lpc_sse.c",
+ "celt/x86/celt_lpc_sse4_1.c",
"celt/x86/pitch_sse4_1.c",
// SILK_SOURCES_SSE4_1
- "silk/x86/NSQ_sse.c",
- "silk/x86/NSQ_del_dec_sse.c",
+ "silk/x86/NSQ_sse4_1.c",
+ "silk/x86/NSQ_del_dec_sse4_1.c",
"silk/x86/x86_silk_map.c",
- "silk/x86/VAD_sse.c",
- "silk/x86/VQ_WMat_EC_sse.c",
+ "silk/x86/VAD_sse4_1.c",
+ "silk/x86/VQ_WMat_EC_sse4_1.c",
// SILK_SOURCES_FIXED_SSE4_1
- "silk/fixed/x86/vector_ops_FIX_sse.c",
- "silk/fixed/x86/burg_modified_FIX_sse.c",
+ "silk/fixed/x86/vector_ops_FIX_sse4_1.c",
+ "silk/fixed/x86/burg_modified_FIX_sse4_1.c",
],
cflags: [
@@ -293,6 +297,7 @@ cc_library_shared {
// CELT_SOURCES_SSE2
"celt/x86/pitch_sse2.c",
+ "celt/x86/vq_sse2.c",
],
cflags: [
@@ -306,19 +311,19 @@ cc_library_shared {
sse4_1: {
srcs: [
// CELT_SOURCES_SSE4_1
- "celt/x86/celt_lpc_sse.c",
+ "celt/x86/celt_lpc_sse4_1.c",
"celt/x86/pitch_sse4_1.c",
// SILK_SOURCES_SSE4_1
- "silk/x86/NSQ_sse.c",
- "silk/x86/NSQ_del_dec_sse.c",
+ "silk/x86/NSQ_sse4_1.c",
+ "silk/x86/NSQ_del_dec_sse4_1.c",
"silk/x86/x86_silk_map.c",
- "silk/x86/VAD_sse.c",
- "silk/x86/VQ_WMat_EC_sse.c",
+ "silk/x86/VAD_sse4_1.c",
+ "silk/x86/VQ_WMat_EC_sse4_1.c",
// SILK_SOURCES_FIXED_SSE4_1
- "silk/fixed/x86/vector_ops_FIX_sse.c",
- "silk/fixed/x86/burg_modified_FIX_sse.c",
+ "silk/fixed/x86/vector_ops_FIX_sse4_1.c",
+ "silk/fixed/x86/burg_modified_FIX_sse4_1.c",
],
cflags: [