Merge "Add service-virtualization.jar to PRODUCT_APEX_SYSTEM_SERVER_JARS" into main am: 65146d24b0 am: 40cb5a1d84

Original change: https://android-review.googlesource.com/c/platform/build/+/2946229

Change-Id: I69022ed42a763bfdf8eb870c18bc82d89c2765ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk
index cf6d97a..19fcdf4 100644
--- a/target/product/default_art_config.mk
+++ b/target/product/default_art_config.mk
@@ -134,6 +134,10 @@
 
 endif
 
+ifeq ($(RELEASE_AVF_ENABLE_LLPVM_CHANGES),true)
+  PRODUCT_APEX_SYSTEM_SERVER_JARS += com.android.virt:service-virtualization
+endif
+
 # Use $(wildcard) to avoid referencing the profile in thin manifests that don't have the
 # art project.
 ifneq (,$(wildcard art))