commit 28680e7bc4f278fa0f082b745423f93e23b1ae1e
author Kiyoung Kim <kiyoungkim@google.com> Mon Oct 14 02:17:48 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Oct 14 02:17:48 2024 +0000
tree 65028c2e248f2ddc60203e24ec844562a0a386dd
parent 2d3131f8a825f99d5b369f7eeecabbe8cb7ceb5c
parent 4fb0ea30560a5022c4b4d9ab188cf63eaecce608

Merge "Convert vintf_fragments into vintf_fragment module(s)" into main am: 4fb0ea3056

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3304586

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

build/apex/Android.bp

diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index 4916df7..f794239 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -80,6 +80,11 @@
     }),
 }
 
+vintf_fragment {
+    name: "virtualizationservice.xml",
+    src: "virtualizationservice.xml",
+}
+
 apex_defaults {
     name: "com.android.virt_avf_enabled",
 
@@ -166,7 +171,7 @@
         true: "AndroidManifest.xml",
         default: unset,
     }),
-    vintf_fragments: select(soong_config_variable("ANDROID", "avf_remote_attestation_enabled"), {
+    vintf_fragment_modules: select(soong_config_variable("ANDROID", "avf_remote_attestation_enabled"), {
         "true": ["virtualizationservice.xml"],
         default: unset,
     }),