Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e73a9028 authored by Alice Wang's avatar Alice Wang Committed by Automerger Merge Worker
Browse files

Merge "Allow AVF remote attestation to be disabled" into main am: 9347e36e 

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



Change-Id: I1ce6dfb7f4fe21f0e6b0e84d0ea7e1a3dee1e461
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bbb9d437 9347e36e

core/android_soong_config_vars.mk

+8 −0
Original line number Diff line number Diff line
@@ -68,6 +68,12 @@ ifdef PRODUCT_AVF_ENABLED 
$(call add_soong_config_var_value,ANDROID,avf_enabled,$(PRODUCT_AVF_ENABLED))

endif



# Enable AVF remote attestation according to the flag value if PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED is not

# set to true explicitly.

ifneq (true,$(PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED))

  $(call add_soong_config_var_value,ANDROID,avf_remote_attestation_enabled,$(RELEASE_AVF_ENABLE_REMOTE_ATTESTATION))

endif



ifdef PRODUCT_AVF_MICRODROID_GUEST_GKI_VERSION

$(call add_soong_config_var_value,ANDROID,avf_microdroid_guest_gki_version,$(PRODUCT_AVF_MICRODROID_GUEST_GKI_VERSION))

endif
@@ -86,6 +92,8 @@ $(call add_soong_config_var_value,ANDROID,release_avf_enable_dice_changes,$(RELE 
$(call add_soong_config_var_value,ANDROID,release_avf_enable_llpvm_changes,$(RELEASE_AVF_ENABLE_LLPVM_CHANGES))

$(call add_soong_config_var_value,ANDROID,release_avf_enable_multi_tenant_microdroid_vm,$(RELEASE_AVF_ENABLE_MULTI_TENANT_MICRODROID_VM))

$(call add_soong_config_var_value,ANDROID,release_avf_enable_network,$(RELEASE_AVF_ENABLE_NETWORK))

# TODO(b/341292601): This flag is needed until the V release. We with clean it up after V together

# with most of the release_avf_ flags here.

$(call add_soong_config_var_value,ANDROID,release_avf_enable_remote_attestation,$(RELEASE_AVF_ENABLE_REMOTE_ATTESTATION))

$(call add_soong_config_var_value,ANDROID,release_avf_enable_vendor_modules,$(RELEASE_AVF_ENABLE_VENDOR_MODULES))

$(call add_soong_config_var_value,ANDROID,release_avf_enable_virt_cpufreq,$(RELEASE_AVF_ENABLE_VIRT_CPUFREQ))

core/product.mk

+3 −0
Original line number Diff line number Diff line
@@ -426,6 +426,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 false, disable the AVF remote attestaton feature.

_product_single_value_vars += PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED



# If true, kernel with modules will be used for Microdroid VMs.

_product_single_value_vars += PRODUCT_AVF_KERNEL_MODULES_ENABLED