Add a VirtualizationSystemService that runs inside system_server
This service will later be used to subscribe to trigger clean up
routines when an app is deleted.
The code is located in the
/apex/com.android.virt/javalib/service-virtualization.jar. This jar
contributes to the system_server classpath.
The service-virtualization.jar will be installed for both AVF enabled &
AVF disabled variants of the virt APEX. However, on the devices that do
not support AVF (i.e. using AVF disabled virt APEX), the
VirtualizationSystemService won't be started, since the AVF disabled
virt APEX won't have the `<apex-system-service>` entry in it's
AndroidManifest.xml
The change is guarded by the RELEASE_AVF_ENABLE_LLPVM_CHANGES build
flag.
Bug: 323339759
Test: boot device & check logs
Change-Id: I948be5eb38a9911d510f63e4976c117ccdb291f8
diff --git a/apex/Android.bp b/apex/Android.bp
index 7c45cc5..7cc0414 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -32,7 +32,26 @@
},
}
-apex_defaults {
+soong_config_module_type {
+ name: "avf_flag_aware_apex_defaults",
+ module_type: "apex_defaults",
+ config_namespace: "ANDROID",
+ bool_variables: [
+ "release_avf_enable_device_assignment",
+ "release_avf_enable_llpvm_changes",
+ "release_avf_enable_remote_attestation",
+ "release_avf_enable_vendor_modules",
+ ],
+ properties: [
+ "androidManifest",
+ "arch",
+ "prebuilts",
+ "systemserverclasspath_fragments",
+ "vintf_fragments",
+ ],
+}
+
+avf_flag_aware_apex_defaults {
name: "com.android.virt_common",
// TODO(jiyong): make it updatable
updatable: false,
@@ -65,22 +84,13 @@
"libsso",
"libutils",
],
-}
-
-soong_config_module_type {
- name: "avf_flag_aware_apex_defaults",
- module_type: "apex_defaults",
- config_namespace: "ANDROID",
- bool_variables: [
- "release_avf_enable_device_assignment",
- "release_avf_enable_remote_attestation",
- "release_avf_enable_vendor_modules",
- ],
- properties: [
- "arch",
- "prebuilts",
- "vintf_fragments",
- ],
+ soong_config_variables: {
+ release_avf_enable_llpvm_changes: {
+ systemserverclasspath_fragments: [
+ "com.android.virt-systemserver-fragment",
+ ],
+ },
+ },
}
avf_flag_aware_apex_defaults {
@@ -143,6 +153,9 @@
},
},
},
+ release_avf_enable_llpvm_changes: {
+ androidManifest: "AndroidManifest.xml",
+ },
release_avf_enable_vendor_modules: {
prebuilts: [
"microdroid_gki-android14-6.1_initrd_debuggable",
@@ -322,3 +335,29 @@
],
},
}
+
+soong_config_module_type {
+ name: "avf_flag_aware_systemserverclasspath_fragment",
+ module_type: "systemserverclasspath_fragment",
+ config_namespace: "ANDROID",
+ bool_variables: [
+ "release_avf_enable_llpvm_changes",
+ ],
+ properties: [
+ "enabled",
+ ],
+}
+
+avf_flag_aware_systemserverclasspath_fragment {
+ name: "com.android.virt-systemserver-fragment",
+ contents: [
+ "service-virtualization",
+ ],
+ apex_available: ["com.android.virt"],
+ enabled: false,
+ soong_config_variables: {
+ release_avf_enable_llpvm_changes: {
+ enabled: true,
+ },
+ },
+}