Convert vintf_fragments into vintf_fragment module(s)
Convert vintf_fragments into vintf_fragment module(s) so those manifests
can be handled in the same way between KATI defined system image and
Soong defined system image.
Bug: 322089980
Test: aosp_cf_x86_64_phone build succeeded
Change-Id: Ie150676bde58d0723eab354e1eba03daabbe54c2
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,
}),