commit c2073f8b61d1c73d5917c5a961707c792b52493a
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Jan 02 12:09:10 2025 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jan 02 12:09:10 2025 -0800
tree 3535d6a8766b5f80b9651fe499a32a99c7c1548a
parent 1c549ffb48067820f24cdc85d0f1ca6cf771a33d
parent 0371b379cfeb26fc24037a5b797017705998c6e7

Merge "Define vintf_fragments as modules" into main am: 0371b379cf

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3431859

Change-Id: I3f097b0d9fc856b273096ada0315a3b0d4e5805c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

boot/aidl/default/Android.bp

diff --git a/boot/aidl/default/Android.bp b/boot/aidl/default/Android.bp
index c1d3c57..2fd2dad 100644
--- a/boot/aidl/default/Android.bp
+++ b/boot/aidl/default/Android.bp
@@ -57,7 +57,7 @@
     name: "android.hardware.boot-service.default_recovery",
     defaults: ["android.hardware.boot-service_common"],
     init_rc: ["android.hardware.boot-service.default_recovery.rc"],
-    vintf_fragments: ["android.hardware.boot-service.default.xml"],
+    vintf_fragment_modules: ["android.hardware.boot-service.default.xml.recovery"],
     recovery: true,
 
     shared_libs: [
@@ -77,11 +77,16 @@
     installable: false,
 }
 
-prebuilt_etc {
+vintf_fragment {
+    name: "android.hardware.boot-service.default.xml.recovery",
+    src: "android.hardware.boot-service.default.xml",
+    recovery: true,
+}
+
+vintf_fragment {
     name: "android.hardware.boot-service.default.xml",
     src: "android.hardware.boot-service.default.xml",
-    sub_dir: "vintf",
-    installable: false,
+    vendor: true,
 }
 
 apex {
@@ -98,6 +103,8 @@
     ],
     prebuilts: [
         "android.hardware.boot-service.default.rc",
+    ],
+    vintf_fragment_modules: [
         "android.hardware.boot-service.default.xml",
     ],
 }