From db74638a1cadaccd7a89e84aebc603fd99b19681 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 21 Mar 2024 21:08:56 +0000 Subject: Remove useless `neon:` clause. There hasn't been a non-neon platform build in years. Even the NDK hasn't supported non-neon for two years now. Change-Id: I1d892e8bd97371a87771183655c1e5803a7e4400 --- Android.bp | 137 +++++++++++++++++++++++++++++-------------------------------- 1 file changed, 65 insertions(+), 72 deletions(-) diff --git a/Android.bp b/Android.bp index 6d5344b..3b138c8 100644 --- a/Android.bp +++ b/Android.bp @@ -199,85 +199,78 @@ cc_library_static { arch: { arm: { + cflags: [ + ], + local_include_dirs: [ + "decoder/armv7", ], srcs: [ "decoder/generic/ixheaacd_function_selector_generic.c", "decoder/generic/ixheaacd_qmf_dec_generic.c", + "decoder/armv7/ixheaacd_fft_armv7.c", + "decoder/armv7/ixheaacd_function_selector_armv7.c", + "decoder/armv7/ixheaacd_qmf_dec_armv7.c", + "decoder/armv7/ixheaacd_aac_ld_dec_rearrange.s", + "decoder/armv7/ixheaacd_apply_rot.s", + "decoder/armv7/ixheaacd_apply_scale_fac.s", + "decoder/armv7/ixheaacd_autocorr_st2.s", + "decoder/armv7/ixheaacd_auto_corr.s", + "decoder/armv7/ixheaacd_calcmaxspectralline.s", + "decoder/armv7/ixheaacd_calc_post_twid.s", + "decoder/armv7/ixheaacd_calc_pre_twid.s", + "decoder/armv7/ixheaacd_complex_fft_p2.s", + "decoder/armv7/ixheaacd_complex_ifft_p2.s", + "decoder/armv7/ixheaacd_conv_ergtoamplitude.s", + "decoder/armv7/ixheaacd_conv_ergtoamplitudelp.s", + "decoder/armv7/ixheaacd_cos_sin_mod.s", + "decoder/armv7/ixheaacd_dct3_32.s", + "decoder/armv7/ixheaacd_decorr_filter2.s", + "decoder/armv7/ixheaacd_dec_DCT2_64_asm.s", + "decoder/armv7/ixheaacd_eld_decoder_sbr_pre_twiddle.s", + "decoder/armv7/ixheaacd_enery_calc_per_subband.s", + "decoder/armv7/ixheaacd_esbr_cos_sin_mod_loop1.s", + "decoder/armv7/ixheaacd_esbr_cos_sin_mod_loop2.s", + "decoder/armv7/ixheaacd_esbr_fwd_modulation.s", + "decoder/armv7/ixheaacd_esbr_qmfsyn64_winadd.s", + "decoder/armv7/ixheaacd_esbr_radix4bfly.s", + "decoder/armv7/ixheaacd_expsubbandsamples.s", + "decoder/armv7/ixheaacd_ffr_divide16.s", + "decoder/armv7/ixheaacd_fft32x32_ld2_armv7.s", + "decoder/armv7/ixheaacd_fft_15_ld.s", + "decoder/armv7/ixheaacd_fwd_modulation.s", + "decoder/armv7/ixheaacd_harm_idx_zerotwolp.s", + "decoder/armv7/ixheaacd_imdct_using_fft.s", + "decoder/armv7/ixheaacd_inv_dit_fft_8pt.s", + "decoder/armv7/ixheaacd_lap1.s", + "decoder/armv7/ixheaacd_mps_complex_fft_64_asm.s", + "decoder/armv7/ixheaacd_mps_synt_out_calc.s", + "decoder/armv7/ixheaacd_mps_synt_post_fft_twiddle.s", + "decoder/armv7/ixheaacd_mps_synt_post_twiddle.s", + "decoder/armv7/ixheaacd_mps_synt_pre_twiddle.s", + "decoder/armv7/ixheaacd_no_lap1.s", + "decoder/armv7/ixheaacd_overlap_add1.s", + "decoder/armv7/ixheaacd_overlap_add2.s", + "decoder/armv7/ixheaacd_post_radix_compute2.s", + "decoder/armv7/ixheaacd_post_radix_compute4.s", + "decoder/armv7/ixheaacd_post_twiddle.s", + "decoder/armv7/ixheaacd_post_twiddle_overlap.s", + "decoder/armv7/ixheaacd_pre_twiddle_compute.s", + "decoder/armv7/ixheaacd_radix4_bfly.s", + "decoder/armv7/ixheaacd_rescale_subbandsamples.s", + "decoder/armv7/ixheaacd_sbr_imdct_using_fft.s", + "decoder/armv7/ixheaacd_sbr_qmfanal32_winadds.s", + "decoder/armv7/ixheaacd_sbr_qmfanal32_winadds_eld.s", + "decoder/armv7/ixheaacd_sbr_qmfsyn64_winadd.s", + "decoder/armv7/ixheaacd_shiftrountine.s", + "decoder/armv7/ixheaacd_shiftrountine_with_rnd_eld.s", + "decoder/armv7/ixheaacd_shiftrountine_with_round.s", + "decoder/armv7/ixheaacd_shiftrountine_with_round_hq.s", + "decoder/armv7/ixheaacd_tns_ar_filter_fixed.s", + "decoder/armv7/ixheaacd_tns_ar_filter_fixed_32x16.s", + "decoder/armv7/ixheaacd_tns_parcor2lpc_32x16.s", ], - neon: { - cflags: [ - ], - - local_include_dirs: [ - "decoder/armv7", - ], - - srcs: [ - "decoder/armv7/ixheaacd_fft_armv7.c", - "decoder/armv7/ixheaacd_function_selector_armv7.c", - "decoder/armv7/ixheaacd_qmf_dec_armv7.c", - "decoder/armv7/ixheaacd_aac_ld_dec_rearrange.s", - "decoder/armv7/ixheaacd_apply_rot.s", - "decoder/armv7/ixheaacd_apply_scale_fac.s", - "decoder/armv7/ixheaacd_autocorr_st2.s", - "decoder/armv7/ixheaacd_auto_corr.s", - "decoder/armv7/ixheaacd_calcmaxspectralline.s", - "decoder/armv7/ixheaacd_calc_post_twid.s", - "decoder/armv7/ixheaacd_calc_pre_twid.s", - "decoder/armv7/ixheaacd_complex_fft_p2.s", - "decoder/armv7/ixheaacd_complex_ifft_p2.s", - "decoder/armv7/ixheaacd_conv_ergtoamplitude.s", - "decoder/armv7/ixheaacd_conv_ergtoamplitudelp.s", - "decoder/armv7/ixheaacd_cos_sin_mod.s", - "decoder/armv7/ixheaacd_dct3_32.s", - "decoder/armv7/ixheaacd_decorr_filter2.s", - "decoder/armv7/ixheaacd_dec_DCT2_64_asm.s", - "decoder/armv7/ixheaacd_eld_decoder_sbr_pre_twiddle.s", - "decoder/armv7/ixheaacd_enery_calc_per_subband.s", - "decoder/armv7/ixheaacd_esbr_cos_sin_mod_loop1.s", - "decoder/armv7/ixheaacd_esbr_cos_sin_mod_loop2.s", - "decoder/armv7/ixheaacd_esbr_fwd_modulation.s", - "decoder/armv7/ixheaacd_esbr_qmfsyn64_winadd.s", - "decoder/armv7/ixheaacd_esbr_radix4bfly.s", - "decoder/armv7/ixheaacd_expsubbandsamples.s", - "decoder/armv7/ixheaacd_ffr_divide16.s", - "decoder/armv7/ixheaacd_fft32x32_ld2_armv7.s", - "decoder/armv7/ixheaacd_fft_15_ld.s", - "decoder/armv7/ixheaacd_fwd_modulation.s", - "decoder/armv7/ixheaacd_harm_idx_zerotwolp.s", - "decoder/armv7/ixheaacd_imdct_using_fft.s", - "decoder/armv7/ixheaacd_inv_dit_fft_8pt.s", - "decoder/armv7/ixheaacd_lap1.s", - "decoder/armv7/ixheaacd_mps_complex_fft_64_asm.s", - "decoder/armv7/ixheaacd_mps_synt_out_calc.s", - "decoder/armv7/ixheaacd_mps_synt_post_fft_twiddle.s", - "decoder/armv7/ixheaacd_mps_synt_post_twiddle.s", - "decoder/armv7/ixheaacd_mps_synt_pre_twiddle.s", - "decoder/armv7/ixheaacd_no_lap1.s", - "decoder/armv7/ixheaacd_overlap_add1.s", - "decoder/armv7/ixheaacd_overlap_add2.s", - "decoder/armv7/ixheaacd_post_radix_compute2.s", - "decoder/armv7/ixheaacd_post_radix_compute4.s", - "decoder/armv7/ixheaacd_post_twiddle.s", - "decoder/armv7/ixheaacd_post_twiddle_overlap.s", - "decoder/armv7/ixheaacd_pre_twiddle_compute.s", - "decoder/armv7/ixheaacd_radix4_bfly.s", - "decoder/armv7/ixheaacd_rescale_subbandsamples.s", - "decoder/armv7/ixheaacd_sbr_imdct_using_fft.s", - "decoder/armv7/ixheaacd_sbr_qmfanal32_winadds.s", - "decoder/armv7/ixheaacd_sbr_qmfanal32_winadds_eld.s", - "decoder/armv7/ixheaacd_sbr_qmfsyn64_winadd.s", - "decoder/armv7/ixheaacd_shiftrountine.s", - "decoder/armv7/ixheaacd_shiftrountine_with_rnd_eld.s", - "decoder/armv7/ixheaacd_shiftrountine_with_round.s", - "decoder/armv7/ixheaacd_shiftrountine_with_round_hq.s", - "decoder/armv7/ixheaacd_tns_ar_filter_fixed.s", - "decoder/armv7/ixheaacd_tns_ar_filter_fixed_32x16.s", - "decoder/armv7/ixheaacd_tns_parcor2lpc_32x16.s", - ], - }, }, arm64: { -- cgit v1.2.3