Merge "Move mediaextractor seccomp policy into apex" into qt-dev (6d831980) · Commits · e / os / android_frameworks_av

apex/Android.bp

+3 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,9 @@ apex_defaults {
		],
		},
		},
		prebuilts: [
		"mediaextractor.policy",
		],
		key: "com.android.media.key",
		certificate: ":com.android.media.certificate",

services/mediaextractor/Android.bp

0 → 100644

+71 −0

Original line number	Diff line number	Diff line
		// service library
		cc_library_shared {
		name: "libmediaextractorservice",
		cflags: [
		"-Wall",
		"-Werror",
		],
		srcs: ["MediaExtractorService.cpp"],

		shared_libs: [
		"libmedia",
		"libstagefright",
		"libbinder",
		"libutils",
		],
		}

		// service executable
		cc_binary {
		name: "mediaextractor",

		srcs: ["main_extractorservice.cpp"],
		shared_libs: [
		"libmedia",
		"libmediaextractorservice",
		"libbinder",
		"libutils",
		"liblog",
		"libavservices_minijail",
		],
		target: {
		android: {
		product_variables: {
		malloc_not_svelte: {
		// Scudo increases memory footprint, so only enable on
		// non-svelte devices.
		shared_libs: ["libc_scudo"],
		},
		},
		},
		},
		init_rc: ["mediaextractor.rc"],

		include_dirs: ["frameworks/av/media/libmedia"],

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

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

services/mediaextractor/Android.mk

deleted100644 → 0

+0 −43

Original line number	Diff line number	Diff line
		LOCAL_PATH := $(call my-dir)

		# service library
		include $(CLEAR_VARS)
		LOCAL_CFLAGS := -Wall -Werror
		LOCAL_SRC_FILES := \
		MediaExtractorService.cpp

		LOCAL_SHARED_LIBRARIES := libmedia libstagefright libbinder libutils
		LOCAL_MODULE:= libmediaextractorservice
		include $(BUILD_SHARED_LIBRARY)


		# service executable
		include $(CLEAR_VARS)
		# seccomp filters are defined for the following architectures:
		LOCAL_REQUIRED_MODULES_arm := crash_dump.policy mediaextractor.policy
		LOCAL_REQUIRED_MODULES_arm64 := crash_dump.policy mediaextractor.policy
		LOCAL_REQUIRED_MODULES_x86 := crash_dump.policy mediaextractor.policy
		LOCAL_REQUIRED_MODULES_x86_64 := crash_dump.policy mediaextractor.policy

		LOCAL_SRC_FILES := main_extractorservice.cpp
		ifneq (true, $(filter true, $(MALLOC_SVELTE)))
		# Scudo increases memory footprint, so only use on non-svelte configs.
		LOCAL_SHARED_LIBRARIES := libc_scudo
		endif
		LOCAL_SHARED_LIBRARIES += libmedia libmediaextractorservice libbinder libutils \
		liblog libandroidicu libavservices_minijail
		LOCAL_MODULE:= mediaextractor
		LOCAL_INIT_RC := mediaextractor.rc
		LOCAL_C_INCLUDES := frameworks/av/media/libmedia
		LOCAL_CFLAGS := -Wall -Werror
		include $(BUILD_EXECUTABLE)

		# service seccomp filter
		ifeq ($(TARGET_ARCH), $(filter $(TARGET_ARCH), arm arm64 x86 x86_64))
		include $(CLEAR_VARS)
		LOCAL_MODULE := mediaextractor.policy
		LOCAL_MODULE_CLASS := ETC
		LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/seccomp_policy
		LOCAL_SRC_FILES := seccomp_policy/mediaextractor-$(TARGET_ARCH).policy
		include $(BUILD_PREBUILT)
		endif

services/mediaextractor/main_extractorservice.cpp

+1 −4

Original line number	Diff line number	Diff line
		@@ -15,7 +15,6 @@
		** limitations under the License.
		*/

		#include <aicu/AIcu.h>
		#include <fcntl.h>
		#include <sys/prctl.h>
		#include <sys/wait.h>
		@@ -37,7 +36,7 @@
		using namespace android;

		static const char kSystemSeccompPolicyPath[] =
		"/system/etc/seccomp_policy/mediaextractor.policy";
		"/apex/com.android.media/etc/seccomp_policy/mediaextractor.policy";
		static const char kVendorSeccompPolicyPath[] =
		"/vendor/etc/seccomp_policy/mediaextractor.policy";

		@@ -58,8 +57,6 @@ int main(int argc __unused, char** argv)

		SetUpMinijail(kSystemSeccompPolicyPath, kVendorSeccompPolicyPath);

		AIcu_initializeIcuOrDie();

		strcpy(argv[0], "media.extractor");
		sp<ProcessState> proc(ProcessState::self());
		sp<IServiceManager> sm = defaultServiceManager();