Merge "audio: Support 64bit configuration on 32+64bit compatible OS" (f665b8fa) · Commits · e / os / android_hardware_interfaces

audio/common/all-versions/default/service/Android.bp

+32 −5

Original line number	Diff line number	Diff line
		@@ -7,17 +7,40 @@ package {
		default_applicable_licenses: ["hardware_interfaces_license"],
		}

		cc_binary {
		name: "android.hardware.audio.service",
		soong_config_module_type {
		name: "android_hardware_audio_config_default",
		module_type: "cc_defaults",
		config_namespace: "android_hardware_audio",
		bool_variables: [
		"run_64bit",
		],
		properties: ["compile_multilib"],
		}

		init_rc: ["android.hardware.audio.service.rc"],
		relative_install_path: "hw",
		vendor: true,
		android_hardware_audio_config_default {
		name: "android_hardware_audio_config_defaults",

		soong_config_variables: {
		run_64bit: {
		conditions_default: {
		// Prefer 32 bit as the binary must always be installed at the same
		// location for init to start it and the build system does not support
		// having two binaries installable to the same location even if they are
		// not installed in the same build.
		compile_multilib: "prefer32",
		},
		compile_multilib: "64",
		},
		},
		}

		cc_binary {
		name: "android.hardware.audio.service",

		init_rc: ["android.hardware.audio.service.rc"],
		relative_install_path: "hw",
		vendor: true,

		srcs: ["service.cpp"],

		cflags: [
		@@ -34,6 +57,10 @@ cc_binary {
		"libutils",
		"libhardware",
		],

		defaults: [
		"android_hardware_audio_config_defaults",
		],
		}

		// Legacy service name, use android.hardware.audio.service instead