Merge changes from topics "move-avf-jar-to-bcp", "virt-apex-on-system"
* changes:
Add framework-virtualization to PRODUCT_APEX_BOOT_JARS
Unconditionally install com.android.virt APEX
diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index 9f305cf..7a2dea6 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -102,6 +102,10 @@
# SystemUI.
$(call add_soong_config_var,ANDROID,SYSTEMUI_OPTIMIZE_JAVA)
+ifdef PRODUCT_AVF_ENABLED
+$(call add_soong_config_var_value,ANDROID,avf_enabled,$(PRODUCT_AVF_ENABLED))
+endif
+
# Enable system_server optimizations by default unless explicitly set or if
# there may be dependent runtime jars.
# TODO(b/240588226): Remove the off-by-default exceptions after handling
diff --git a/core/product.mk b/core/product.mk
index 277fa74..dcfdf1f 100644
--- a/core/product.mk
+++ b/core/product.mk
@@ -367,6 +367,9 @@
# BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE but not an explicitly set value.
_product_single_value_vars += PRODUCT_MODULE_BUILD_FROM_SOURCE
+# If true, installs a full version of com.android.virt APEX.
+_product_single_value_vars += PRODUCT_AVF_ENABLED
+
.KATI_READONLY := _product_single_value_vars _product_list_vars
_product_var_list :=$= $(_product_single_value_vars) $(_product_list_vars)
diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 96d7b2f..e01bb8c 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -72,6 +72,7 @@
com.android.tethering \
com.android.tzdata \
com.android.uwb \
+ com.android.virt \
com.android.wifi \
ContactsProvider \
content \
diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk
index 901302e..20d2865 100644
--- a/target/product/default_art_config.mk
+++ b/target/product/default_art_config.mk
@@ -70,6 +70,7 @@
com.android.tethering:framework-connectivity-t \
com.android.tethering:framework-tethering \
com.android.uwb:framework-uwb \
+ com.android.virt:framework-virtualization \
com.android.wifi:framework-wifi \
# List of system_server classpath jars delivered via apex.