commit 3f38b0dd0211c8630d07c83996e2da871b6d0d45
author Kiyoung Kim <kiyoungkim@google.com> Thu Oct 17 00:46:55 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 17 00:46:55 2024 +0000
tree 8717e734e4c731a5d214178a198996d0d8d20434
parent 3359ab5494405b596a1c6e2492c24a41bacf96d3
parent c5d4fe25bf2262e64e0b427e9924ff8cdba06eb9

Merge "Convert vintf_fragments into vintf_fragment module(s)" into main

services/Android.bp

diff --git a/services/Android.bp b/services/Android.bp
index 653cd3c3..f04c692 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -195,7 +195,17 @@
     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 {
@@ -264,11 +274,11 @@
 
     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",
                 ],