Merge "Make software codecs as VNDK" into oc-mr1-dev (ae0654c8) · Commits · e / os / android_frameworks_av

media/libmedia/Android.bp

+3 −0

Original line number	Diff line number	Diff line
		@@ -124,6 +124,9 @@ cc_defaults {
		cc_library_shared {
		name: "libmedia_omx",
		vendor_available: true,
		vndk: {
		enabled: true,
		},

		defaults: ["libmedia_omx_defaults"],
		}

+4 −0

Original line number	Diff line number	Diff line
		cc_library_shared {
		name: "libstagefright_soft_aacdec",
		vendor_available: true,
		vndk: {
		enabled: true,
		},

		srcs: [
		"SoftAAC2.cpp",

+5 −0

Original line number	Diff line number	Diff line
		cc_library_static {
		name: "libstagefright_aacenc",
		vendor_available: true,

		srcs: [
		"basic_op/basicop2.c",
		@@ -111,6 +112,10 @@ cc_library_static {

		cc_library_shared {
		name: "libstagefright_soft_aacenc",
		vendor_available: true,
		vndk: {
		enabled: true,
		},

		srcs: ["SoftAACEncoder2.cpp"],

+4 −0

Original line number	Diff line number	Diff line
		cc_library_shared {
		name: "libstagefright_amrnb_common",
		vendor_available: true,
		vndk: {
		enabled: true,
		},

		srcs: [
		"src/add.cpp",

+9 −1

Original line number	Diff line number	Diff line
		cc_library_static {
		name: "libstagefright_amrnbdec",
		vendor_available: true,

		srcs: [
		"src/a_refl.cpp",
		@@ -55,13 +56,20 @@ cc_library_static {
		// ],
		//},

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

		//###############################################################################

		cc_library_shared {
		name: "libstagefright_soft_amrdec",
		vendor_available: true,
		vndk: {
		enabled: true,
		},

		srcs: ["SoftAMR.cpp"],