diff options
| author | 2024-11-15 03:12:29 +0000 | |
|---|---|---|
| committer | 2024-11-15 03:12:29 +0000 | |
| commit | f8c7ec6a4d0c0948af450d4b4440bb059f11af07 (patch) | |
| tree | ef00225438700660b1fa1b4d84821c8dc90a24b1 | |
| parent | 98e0ada518dbe84630d39bbd2f4f83507b05a214 (diff) | |
| parent | da3d4f366e2c24b7359addf4881053dab792cc10 (diff) | |
Merge "Convert vintf_fragments into vintf_fragment module(s)" into aosp-main-future
| -rw-r--r-- | services/Android.bp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/services/Android.bp b/services/Android.bp index cc20d702b3b8..437e6ef97ea8 100644 --- a/services/Android.bp +++ b/services/Android.bp @@ -195,7 +195,17 @@ soong_config_module_type { module_type: "java_library", config_namespace: "system_services", bool_variables: ["without_vibrator"], - properties: ["vintf_fragments"], + properties: ["vintf_fragment_modules"], +} + +vintf_fragment { + name: "manifest_services.xml", + src: "manifest_services.xml", +} + +vintf_fragment { + name: "manifest_services_android.frameworks.vibrator.xml", + src: "manifest_services_android.frameworks.vibrator.xml", } system_java_library { @@ -265,11 +275,11 @@ system_java_library { soong_config_variables: { without_vibrator: { - vintf_fragments: [ + vintf_fragment_modules: [ "manifest_services.xml", ], conditions_default: { - vintf_fragments: [ + vintf_fragment_modules: [ "manifest_services.xml", "manifest_services_android.frameworks.vibrator.xml", ], |