diff options
| -rw-r--r-- | services/Android.bp | 39 | ||||
| -rw-r--r-- | services/manifest_services_android.frameworks.devicestate.xml | 7 | ||||
| -rw-r--r-- | services/manifest_services_android.frameworks.location.xml (renamed from services/manifest_services.xml) | 5 |
3 files changed, 38 insertions, 13 deletions
diff --git a/services/Android.bp b/services/Android.bp index 3d512f782232..efd35ce8f1a3 100644 --- a/services/Android.bp +++ b/services/Android.bp @@ -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: { - vintf_fragment_modules: [ - "manifest_services.xml", - ], + without_hal: { + vibrator: { + vintf_fragment_modules: [ + "manifest_services_android.frameworks.location.xml", + "manifest_services_android.frameworks.devicestate.xml", + ], + }, + devicestate: { + vintf_fragment_modules: [ + "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", ], }, }, diff --git a/services/manifest_services_android.frameworks.devicestate.xml b/services/manifest_services_android.frameworks.devicestate.xml new file mode 100644 index 000000000000..dc189ec0b40a --- /dev/null +++ b/services/manifest_services_android.frameworks.devicestate.xml @@ -0,0 +1,7 @@ +<manifest version="1.0" type="framework"> + <hal format="aidl"> + <name>android.frameworks.devicestate</name> + <version>1</version> + <fqname>IDeviceStateService/default</fqname> + </hal> +</manifest> diff --git a/services/manifest_services.xml b/services/manifest_services_android.frameworks.location.xml index 945720544991..114fe324f016 100644 --- a/services/manifest_services.xml +++ b/services/manifest_services_android.frameworks.location.xml @@ -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> |