Snap for 6239836 from 6b4d9a1f19aba17aa923369b17316500934ba7d1 to rvc-release (4015d60e) · Commits · e / os / android_frameworks_av

apex/Android.bp

+4 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,8 @@ apex_defaults {
		},
		prebuilts: [
		"mediaextractor.policy",
		"code_coverage.policy",
		"crash_dump.policy",
		],
		key: "com.android.media.key",
		certificate: ":com.android.media.certificate",
		@@ -70,6 +72,8 @@ apex_defaults {
		"com.android.media.swcodec-mediaswcodec.rc",
		"com.android.media.swcodec-ld.config.txt",
		"mediaswcodec.policy",
		"code_coverage.policy",
		"crash_dump.policy",
		"mediaswcodec.xml",
		],
		use_vendor: true,

media/codec2/hidl/1.0/utils/Android.bp

+12 −1

Original line number	Diff line number	Diff line
		@@ -83,11 +83,22 @@ cc_library {
		"libhidlbase",
		"liblog",
		"libstagefright_bufferpool@2.0.1",
		"libstagefright_bufferqueue_helper",
		"libstagefright_bufferqueue_helper_novndk",
		"libui",
		"libutils",
		],

		target: {
		vendor: {
		exclude_shared_libs: [
		"libstagefright_bufferqueue_helper_novndk",
		],
		shared_libs: [
		"libstagefright_bufferqueue_helper",
		],
		},
		},

		export_include_dirs: [
		"include",
		],

media/codec2/hidl/1.1/utils/Android.bp

+12 −2

Original line number	Diff line number	Diff line
		@@ -89,11 +89,22 @@ cc_library {
		"libhidlbase",
		"liblog",
		"libstagefright_bufferpool@2.0.1",
		"libstagefright_bufferqueue_helper",
		"libstagefright_bufferqueue_helper_novndk",
		"libui",
		"libutils",
		],

		target: {
		vendor: {
		exclude_shared_libs: [
		"libstagefright_bufferqueue_helper_novndk",
		],
		shared_libs: [
		"libstagefright_bufferqueue_helper",
		],
		},
		},

		export_include_dirs: [
		"include",
		],
		@@ -106,7 +117,6 @@ cc_library {
		"libcodec2_vndk",
		"libhidlbase",
		"libstagefright_bufferpool@2.0.1",
		"libstagefright_bufferqueue_helper",
		"libui",
		],
		}

media/libstagefright/bqhelper/Android.bp

+46 −15

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

		cc_defaults {
		name: "libstagefright_bufferqueue-defaults",
		double_loadable: true,

		srcs: [
		"FrameDropper.cpp",
		"GraphicBufferSource.cpp",
		@@ -26,7 +22,6 @@ cc_library_shared {
		shared_libs: [
		"libbase",
		"libcutils",
		"libgui",
		"libhidlbase",
		"libhidlmemory",
		"liblog",
		@@ -52,6 +47,23 @@ cc_library_shared {
		"-Wno-documentation",
		],

		sanitize: {
		misc_undefined: [
		"signed-integer-overflow",
		"unsigned-integer-overflow",
		],
		cfi: true,
		},
		}

		cc_library_shared {
		name: "libstagefright_bufferqueue_helper",
		defaults: ["libstagefright_bufferqueue-defaults"],
		vendor_available: true,
		vndk: {
		enabled: true,
		},
		shared_libs: [ "libgui" ],
		target: {
		vendor: {
		exclude_shared_libs: [
		@@ -71,12 +83,31 @@ cc_library_shared {
		],
		},
		},
		}

		sanitize: {
		misc_undefined: [
		"signed-integer-overflow",
		"unsigned-integer-overflow",
		// This lib is needed on devices that doesn't use vndk,
		// on these devices we still don't want libgui to be pulled
		// in onto the apex build. It should only be used by
		// libcodec2_hidl@1.x, etc. from service side. It could
		// be removed if all builds are using vndk.
		cc_library_shared {
		name: "libstagefright_bufferqueue_helper_novndk",
		defaults: ["libstagefright_bufferqueue-defaults"],
		apex_available: [
		"com.android.media.swcodec",
		"test_com.android.media.swcodec",
		],
		vendor_available: false,
		static_libs: [
		"libgui_bufferqueue_static",
		],
		shared_libs: [
		"android.hidl.token@1.0-utils",
		"libEGL",
		"libnativewindow",
		"libvndksupport",
		],
		cflags: [
		"-DNO_BINDER",
		],
		cfi: true,
		},
		}

services/mediacodec/Android.bp

+66 −1

Original line number	Diff line number	Diff line
		@@ -52,11 +52,76 @@ prebuilt_etc {
		src: "seccomp_policy/mediaswcodec-arm64.policy",
		},
		x86: {
		src: "seccomp_policy/mediacodec-x86.policy",
		src: "seccomp_policy/mediaswcodec-x86.policy",
		},
		x86_64: {
		src: "seccomp_policy/mediaswcodec-x86_64.policy",
		},
		},
		required: [
		"crash_dump.policy",
		"code_coverage.policy",
		],
		}

		// media.codec -- the one that handles vendor & HW codecs

		cc_binary {
		name: "android.hardware.media.omx@1.0-service",
		relative_install_path: "hw",
		vendor: true,

		srcs: [
		"main_codecservice.cpp",
		],

		shared_libs: [
		"libbinder",
		"libutils",
		"liblog",
		"libbase",
		"libavservices_minijail",
		"libcutils",
		"libhidlbase",
		"libstagefright_omx",
		"libstagefright_xmlparser",
		"android.hardware.media.omx@1.0",
		"android.hidl.memory@1.0",
		],

		// OMX interfaces force this to stay in 32-bit mode;
		compile_multilib: "32",

		init_rc: ["android.hardware.media.omx@1.0-service.rc"],

		required: [
		"mediacodec.policy",
		],

		cflags: [
		"-Werror",
		"-Wall",
		"-Wno-error=deprecated-declarations",
		],
		}


		prebuilt_etc {
		name: "mediacodec.policy",
		sub_dir: "seccomp_policy",
		arch: {
		arm: {
		src: "seccomp_policy/mediacodec-arm.policy",
		},
		arm64: {
		src: "seccomp_policy/mediacodec-arm64.policy",
		},
		x86: {
		src: "seccomp_policy/mediacodec-x86.policy",
		},
		x86_64: {
		src: "seccomp_policy/mediacodec-x86_64.policy",
		},
		},
		required: [
		"crash_dump.policy",