Merge "mediaextractor: ignore platform's profiler assist signal" am:... (222322a1) · Commits · e / os / android_frameworks_av

services/mediaextractor/Android.bp

+3 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,9 @@ cc_binary {
		"liblog",
		"libavservices_minijail",
		],
		header_libs: [
		"bionic_libc_platform_headers",
		],
		target: {
		android: {
		product_variables: {

+6 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,8 @@
		#include <android-base/properties.h>
		#include <utils/misc.h>

		#include <bionic/reserved_signals.h>

		// from LOCAL_C_INCLUDES
		#include "MediaExtractorService.h"
		#include "MediaUtils.h"
		@@ -49,6 +51,10 @@ int main(int argc __unused, char** argv)

		signal(SIGPIPE, SIG_IGN);

		// Do not assist platform profilers (relevant only on debug builds).
		// Otherwise, the signal handler can violate the seccomp policy.
		signal(BIONIC_SIGNAL_PROFILER, SIG_IGN);

		//b/62255959: this forces libutis.so to dlopen vendor version of libutils.so
		//before minijail is on. This is dirty but required since some syscalls such
		//as pread64 are used by linker but aren't allowed in the minijail. By