Merge "Add soong config to include different Hal services" into main (1f3cc21c) · Commits · e / os / android_frameworks_base

services/Android.bp

+31 −8

Original line number	Diff line number	Diff line
		@@ -244,13 +244,21 @@ soong_config_module_type {
		name: "system_java_library",
		module_type: "java_library",
		config_namespace: "system_services",
		bool_variables: ["without_vibrator"],
		variables: ["without_hal"],
		properties: ["vintf_fragment_modules"],
		}

		soong_config_string_variable {
		name: "without_hal",
		values: [
		"vibrator",
		"devicestate",
		],
		}

		vintf_fragment {
		name: "manifest_services.xml",
		src: "manifest_services.xml",
		name: "manifest_services_android.frameworks.location.xml",
		src: "manifest_services_android.frameworks.location.xml",
		}

		vintf_fragment {
		@@ -258,6 +266,11 @@ vintf_fragment {
		src: "manifest_services_android.frameworks.vibrator.xml",
		}

		vintf_fragment {
		name: "manifest_services_android.frameworks.devicestate.xml",
		src: "manifest_services_android.frameworks.devicestate.xml",
		}

		system_java_library {
		name: "services",
		defaults: [
		@@ -328,14 +341,24 @@ system_java_library {
		],

		soong_config_variables: {
		without_vibrator: {
		without_hal: {
		vibrator: {
		vintf_fragment_modules: [
		"manifest_services_android.frameworks.location.xml",
		"manifest_services_android.frameworks.devicestate.xml",
		],
		},
		devicestate: {
		vintf_fragment_modules: [
		"manifest_services.xml",
		"manifest_services_android.frameworks.location.xml",
		"manifest_services_android.frameworks.vibrator.xml",
		],
		},
		conditions_default: {
		vintf_fragment_modules: [
		"manifest_services.xml",
		"manifest_services_android.frameworks.location.xml",
		"manifest_services_android.frameworks.vibrator.xml",
		"manifest_services_android.frameworks.devicestate.xml",
		],
		},
		},

services/manifest_services_android.frameworks.devicestate.xml

0 → 100644

+7 −0

Original line number	Diff line number	Diff line
		<manifest version="1.0" type="framework">
		<hal format="aidl">
		<name>android.frameworks.devicestate</name>
		<version>1</version>
		<fqname>IDeviceStateService/default</fqname>
		</hal>
		</manifest>

services/manifest_services.xml→services/manifest_services_android.frameworks.location.xml

+0 −5

Original line number	Diff line number	Diff line
		@@ -4,9 +4,4 @@
		<version>2</version>
		<fqname>IAltitudeService/default</fqname>
		</hal>
		<hal format="aidl">
		<name>android.frameworks.devicestate</name>
		<version>1</version>
		<fqname>IDeviceStateService/default</fqname>
		</hal>
		</manifest>