Merge "Remove obsolete `neon:` clause." into main (30fe7300) · Commits · e / os / android_frameworks_av

media/module/codecs/amrwb/enc/Android.bp

+17 −53

Original line number	Diff line number	Diff line
		@@ -78,43 +78,6 @@ cc_library_static {

		arch: {
		arm: {
		srcs: [
		"src/asm/ARMV5E/convolve_opt.s",
		"src/asm/ARMV5E/cor_h_vec_opt.s",
		"src/asm/ARMV5E/Deemph_32_opt.s",
		"src/asm/ARMV5E/Dot_p_opt.s",
		"src/asm/ARMV5E/Filt_6k_7k_opt.s",
		"src/asm/ARMV5E/Norm_Corr_opt.s",
		"src/asm/ARMV5E/pred_lt4_1_opt.s",
		"src/asm/ARMV5E/residu_asm_opt.s",
		"src/asm/ARMV5E/scale_sig_opt.s",
		"src/asm/ARMV5E/Syn_filt_32_opt.s",
		"src/asm/ARMV5E/syn_filt_opt.s",
		],

		cflags: [
		"-DARM",
		"-DASM_OPT",
		],
		local_include_dirs: ["src/asm/ARMV5E"],

		instruction_set: "arm",

		neon: {
		exclude_srcs: [
		"src/asm/ARMV5E/convolve_opt.s",
		"src/asm/ARMV5E/cor_h_vec_opt.s",
		"src/asm/ARMV5E/Deemph_32_opt.s",
		"src/asm/ARMV5E/Dot_p_opt.s",
		"src/asm/ARMV5E/Filt_6k_7k_opt.s",
		"src/asm/ARMV5E/Norm_Corr_opt.s",
		"src/asm/ARMV5E/pred_lt4_1_opt.s",
		"src/asm/ARMV5E/residu_asm_opt.s",
		"src/asm/ARMV5E/scale_sig_opt.s",
		"src/asm/ARMV5E/Syn_filt_32_opt.s",
		"src/asm/ARMV5E/syn_filt_opt.s",
		],

		srcs: [
		"src/asm/ARMV7/convolve_neon.s",
		"src/asm/ARMV7/cor_h_vec_neon.s",
		@@ -129,17 +92,18 @@ cc_library_static {
		"src/asm/ARMV7/syn_filt_neon.s",
		],

		// don't actually generate neon instructions, see bug 26932980
		cflags: [
		"-DARM",
		"-DARMV7",
		"-DASM_OPT",
		// don't actually generate neon instructions, see bug 26932980
		"-mfpu=vfpv3",
		],
		local_include_dirs: [
		"src/asm/ARMV5E",
		"src/asm/ARMV7",
		],
		},

		instruction_set: "arm",
		},
		},