Merge "amrnb: Fix Android.bp formatting issues" into main am: fc319261e7 (fbbdcc8b) · Commits · e / os / android_frameworks_av

media/module/codecs/amrnb/common/Android.bp

+4 −3

Original line number	Original line	Diff line number	Diff line
	package {		package {
			default_team: "trendy_team_media_codec_framework",
	default_applicable_licenses: [		default_applicable_licenses: [
	"frameworks_av_media_codecs_amrnb_common_license",		"frameworks_av_media_codecs_amrnb_common_license",
	],		],
	@@ -42,8 +43,8 @@ cc_library {
	"src/gains_tbl.cpp",		"src/gains_tbl.cpp",
	"src/gc_pred.cpp",		"src/gc_pred.cpp",
	"src/gmed_n.cpp",		"src/gmed_n.cpp",
	"src/grid_tbl.cpp",
	"src/gray_tbl.cpp",		"src/gray_tbl.cpp",
			"src/grid_tbl.cpp",
	"src/int_lpc.cpp",		"src/int_lpc.cpp",
	"src/inv_sqrt.cpp",		"src/inv_sqrt.cpp",
	"src/inv_sqrt_tbl.cpp",		"src/inv_sqrt_tbl.cpp",
	@@ -91,9 +92,9 @@ cc_library {
	export_include_dirs: ["include"],		export_include_dirs: ["include"],

	cflags: [		cflags: [
	"-DOSCL_UNUSED_ARG(x)=(void)(x)",
	"-DOSCL_IMPORT_REF=",
	"-DOSCL_EXPORT_REF=",		"-DOSCL_EXPORT_REF=",
			"-DOSCL_IMPORT_REF=",
			"-DOSCL_UNUSED_ARG(x)=(void)(x)",

	"-Werror",		"-Werror",
	],		],

media/module/codecs/amrnb/dec/Android.bp

+11 −7

Original line number	Original line	Diff line number	Diff line
	package {		package {
			default_team: "trendy_team_media_codec_framework",
	default_applicable_licenses: [		default_applicable_licenses: [
	"frameworks_av_media_codecs_amrnb_dec_license",		"frameworks_av_media_codecs_amrnb_dec_license",
	],		],
	@@ -47,12 +48,12 @@ cc_library_static {
	"src/b_cn_cod.cpp",		"src/b_cn_cod.cpp",
	"src/bgnscd.cpp",		"src/bgnscd.cpp",
	"src/c_g_aver.cpp",		"src/c_g_aver.cpp",
	"src/d1035pf.cpp",
	"src/d2_11pf.cpp",
	"src/d2_9pf.cpp",		"src/d2_9pf.cpp",
			"src/d2_11pf.cpp",
	"src/d3_14pf.cpp",		"src/d3_14pf.cpp",
	"src/d4_17pf.cpp",		"src/d4_17pf.cpp",
	"src/d8_31pf.cpp",		"src/d8_31pf.cpp",
			"src/d1035pf.cpp",
	"src/d_gain_c.cpp",		"src/d_gain_c.cpp",
	"src/d_gain_p.cpp",		"src/d_gain_p.cpp",
	"src/d_plsf.cpp",		"src/d_plsf.cpp",
	@@ -81,8 +82,8 @@ cc_library_static {
	export_include_dirs: ["src"],		export_include_dirs: ["src"],

	cflags: [		cflags: [
	"-DOSCL_UNUSED_ARG(x)=(void)(x)",
	"-DOSCL_IMPORT_REF=",		"-DOSCL_IMPORT_REF=",
			"-DOSCL_UNUSED_ARG(x)=(void)(x)",

	"-Werror",		"-Werror",
	],		],
	@@ -94,8 +95,8 @@ cc_library_static {
	//},		//},

	shared_libs: [		shared_libs: [
	"libstagefright_amrnb_common",
	"liblog",		"liblog",
			"libstagefright_amrnb_common",
	],		],

	target: {		target: {
	@@ -113,19 +114,22 @@ cc_test {

	srcs: ["test/amrnbdec_test.cpp"],		srcs: ["test/amrnbdec_test.cpp"],

	cflags: ["-Wall", "-Werror"],		cflags: [
			"-Wall",
			"-Werror",
			],

	local_include_dirs: ["src"],		local_include_dirs: ["src"],

	static_libs: [		static_libs: [
	"libstagefright_amrnbdec",
	"libsndfile",		"libsndfile",
			"libstagefright_amrnbdec",
	],		],

	shared_libs: [		shared_libs: [
	"libstagefright_amrnb_common",
	"libaudioutils",		"libaudioutils",
	"liblog",		"liblog",
			"libstagefright_amrnb_common",
	],		],

	target: {		target: {

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

+7 −3

Original line number	Original line	Diff line number	Diff line
	package {		package {
			default_team: "trendy_team_media_codec_framework",
	default_applicable_licenses: [		default_applicable_licenses: [
	"frameworks_av_media_codecs_amrnb_enc_license",		"frameworks_av_media_codecs_amrnb_enc_license",
	],		],
	@@ -42,12 +43,12 @@ cc_library_static {
	srcs: [		srcs: [
	"src/amrencode.cpp",		"src/amrencode.cpp",
	"src/autocorr.cpp",		"src/autocorr.cpp",
	"src/c1035pf.cpp",
	"src/c2_11pf.cpp",
	"src/c2_9pf.cpp",		"src/c2_9pf.cpp",
			"src/c2_11pf.cpp",
	"src/c3_14pf.cpp",		"src/c3_14pf.cpp",
	"src/c4_17pf.cpp",		"src/c4_17pf.cpp",
	"src/c8_31pf.cpp",		"src/c8_31pf.cpp",
			"src/c1035pf.cpp",
	"src/calc_cor.cpp",		"src/calc_cor.cpp",
	"src/calc_en.cpp",		"src/calc_en.cpp",
	"src/cbsearch.cpp",		"src/cbsearch.cpp",
	@@ -132,7 +133,10 @@ cc_test {

	srcs: ["test/amrnb_enc_test.cpp"],		srcs: ["test/amrnb_enc_test.cpp"],

	cflags: ["-Wall", "-Werror"],		cflags: [
			"-Wall",
			"-Werror",
			],

	local_include_dirs: ["src"],		local_include_dirs: ["src"],

media/module/codecs/amrnb/enc/fuzzer/Android.bp

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -19,6 +19,7 @@
	*/		*/

	package {		package {
			default_team: "trendy_team_media_codec_framework",
	// See: http://go/android-license-faq		// See: http://go/android-license-faq
	// A large-scale-change added 'default_applicable_licenses' to import		// A large-scale-change added 'default_applicable_licenses' to import
	// all of the 'license_kinds' from "frameworks_av_media_codecs_amrnb_enc_license"		// all of the 'license_kinds' from "frameworks_av_media_codecs_amrnb_enc_license"
	@@ -39,8 +40,8 @@ cc_fuzz {

	static_libs: [		static_libs: [
	"liblog",		"liblog",
	"libstagefright_amrnbenc",
	"libstagefright_amrnb_common",		"libstagefright_amrnb_common",
			"libstagefright_amrnbenc",
	],		],

	fuzz_config: {		fuzz_config: {

media/module/codecs/amrnb/fuzzer/Android.bp

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -19,6 +19,7 @@
	*/		*/

	package {		package {
			default_team: "trendy_team_media_codec_framework",
	// See: http://go/android-license-faq		// See: http://go/android-license-faq
	// A large-scale-change added 'default_applicable_licenses' to import		// A large-scale-change added 'default_applicable_licenses' to import
	// all of the 'license_kinds' from "frameworks_av_license"		// all of the 'license_kinds' from "frameworks_av_license"
	@@ -34,9 +35,9 @@ cc_fuzz {
	"amrnb_dec_fuzzer.cpp",		"amrnb_dec_fuzzer.cpp",
	],		],
	static_libs: [		static_libs: [
	"libstagefright_amrnbdec",
	"libstagefright_amrnb_common",
	"liblog",		"liblog",
			"libstagefright_amrnb_common",
			"libstagefright_amrnbdec",
	],		],
	target: {		target: {
	darwin: {		darwin: {