From 3143499ccb20abdb84581f9d0a4589c741dd89a6 Mon Sep 17 00:00:00 2001
From: Harish Mahendrakar <hmahendrakar@google.com>
Date: Thu, 26 Oct 2023 00:54:57 +0000
Subject: [PATCH] Android.bp: Fix riscv64 build for decoder
- Add appropriate entries in Android.bp for riscv64 for decoder
- Add missing function in function_selector_generic.c
---
Android.bp | 15 ++++++++++++++-
.../generic/ixheaacd_function_selector_generic.c | 4 ++++
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/Android.bp b/Android.bp
index 0969ce6..6d5344b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -338,6 +338,19 @@ cc_library_static {
"decoder/x86_64/ixheaacd_function_selector_x86_64.c",
],
},
+
+ riscv64: {
+ cflags: [
+ ],
+
+ local_include_dirs: [
+ ],
+
+ srcs: [
+ "decoder/generic/ixheaacd_qmf_dec_generic.c",
+ "decoder/generic/ixheaacd_function_selector_generic.c",
+ ],
+ },
},
}
@@ -511,4 +524,4 @@ cc_library_static {
},
}
-subdirs = ["test"]
\ No newline at end of file
+subdirs = ["test"]
diff --git a/decoder/generic/ixheaacd_function_selector_generic.c b/decoder/generic/ixheaacd_function_selector_generic.c
index 36eedb0..16e4f09 100644
--- a/decoder/generic/ixheaacd_function_selector_generic.c
+++ b/decoder/generic/ixheaacd_function_selector_generic.c
@@ -77,6 +77,10 @@ VOID(*ixheaacd_covariance_matrix_calc_960)
(WORD32 *, ia_lpp_trans_cov_matrix *,
WORD32, WORD32) = &ixheaacd_covariance_matrix_calc_dec_960;
+VOID(*ixheaacd_aac_ld_dec_rearrange_960)
+(WORD32 *ip, WORD32 *op, WORD32 mdct_len_2,
+ WORD16 *re_arr_tab) = &ixheaacd_dec_rearrange_short;
+
VOID(*ixheaacd_covariance_matrix_calc_2)
(ia_lpp_trans_cov_matrix *, WORD32 *, WORD32,
WORD16) = &ixheaacd_covariance_matrix_calc_2_dec;