Merge "Support dynamic 64-bit media service" (b80ffdeb) · Commits · e / os / android_frameworks_av

media/mediaserver/Android.bp

+49 −3

Original line number	Diff line number	Diff line
		@@ -26,7 +26,33 @@ cc_library_static {
		],
		}

		cc_binary {
		prebuilt_etc {
		name: "mediaserver.zygote64_32.rc",
		src: "mediaserver.zygote64_32.rc",
		sub_dir: "init/hw",
		}

		prebuilt_etc {
		name: "mediaserver.zygote64.rc",
		src: "mediaserver.zygote64.rc",
		sub_dir: "init/hw",
		}

		soong_config_module_type {
		name: "mediaserver_cc_binary",
		module_type: "cc_binary",
		config_namespace: "ANDROID",
		bool_variables: ["TARGET_DYNAMIC_64_32_MEDIASERVER"],
		properties: [
		"compile_multilib",
		"init_rc",
		"multilib.lib32.suffix",
		"multilib.lib64.suffix",
		"required",
		],
		}

		mediaserver_cc_binary {
		name: "mediaserver",

		srcs: ["main_mediaserver.cpp"],
		@@ -60,12 +86,32 @@ cc_binary {
		// ****************************************************************
		compile_multilib: "prefer32",

		init_rc: ["mediaserver.rc"],

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

		vintf_fragments: ["manifest_media_c2_software.xml"],

		soong_config_variables: {
		TARGET_DYNAMIC_64_32_MEDIASERVER: {
		compile_multilib: "both",
		multilib: {
		lib32: {
		suffix: "32",
		},
		lib64: {
		suffix: "64",
		},
		},
		required: [
		"mediaserver.zygote64_32.rc",
		"mediaserver.zygote64.rc",
		],
		init_rc: ["mediaserver_dynamic.rc"],
		conditions_default: {
		init_rc: ["mediaserver.rc"],
		},
		},
		},
		}

0 → 100644

+6 −0

Original line number	Diff line number	Diff line
		service media /system/bin/mediaserver64
		class main
		user media
		group audio camera inet net_bt net_bt_admin net_bw_acct drmrpc mediadrm
		ioprio rt 4
		task_profiles ProcessCapacityHigh HighPerformance

0 → 100644

+6 −0

Original line number	Diff line number	Diff line
		service media /system/bin/mediaserver32
		class main
		user media
		group audio camera inet net_bt net_bt_admin net_bw_acct drmrpc mediadrm
		ioprio rt 4
		task_profiles ProcessCapacityHigh HighPerformance

0 → 100644

+4 −0

Original line number	Diff line number	Diff line
		on property:init.svc.media=*
		setprop init.svc.mediadrm ${init.svc.media}

		import /system/etc/init/hw/mediaserver.${ro.zygote}.rc