Merge "Add PRODUCT_AVF_KERNEL_MODULES_ENABLED" am: fe22cc38da am: b459a56564 am: 124c1536b6

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

Change-Id: I5161fe7b5e50e45f0d83de154f0ec074fe3618a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Nikita Ioffe 2023-06-08 01:37:56 +00:00 committed by Automerger Merge Worker
commit ec608119c4
2 changed files with 7 additions and 0 deletions

View file

@ -154,6 +154,10 @@ ifdef PRODUCT_AVF_ENABLED
$(call add_soong_config_var_value,ANDROID,avf_enabled,$(PRODUCT_AVF_ENABLED))
endif
ifdef PRODUCT_AVF_KERNEL_MODULES_ENABLED
$(call add_soong_config_var_value,ANDROID,avf_kernel_modules_enabled,$(PRODUCT_AVF_KERNEL_MODULES_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

View file

@ -389,6 +389,9 @@ _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
# If true, kernel with modules will be used for Microdroid VMs.
_product_single_value_vars += PRODUCT_AVF_KERNEL_MODULES_ENABLED
# List of .json files to be merged/compiled into vendor/etc/linker.config.pb
_product_list_vars += PRODUCT_VENDOR_LINKER_CONFIG_FRAGMENTS