Snap for 7818222 from d74e00e3c898e61552e32e8ad7c9dd5194181f58 to tm-release

Change-Id: I0861df53ebfda36380a018888fc94a48c4c89e98

BoardConfig-common.mk

@@ -422,4 +422,10 @@ BOARD_KERNEL_CMDLINE += at24.write_timeout=100
 # Enable larger logbuf
 BOARD_KERNEL_CMDLINE += log_buf_len=1024K
 
+# Protected VM firmware
+BOARD_PREBUILT_PVMFWIMAGE := packages/modules/Virtualization/pvmfw/pvmfw.img
+BOARD_PVMFWIMAGE_PARTITION_SIZE := 0x00100000
+# TODO(ptosi): Delete this variable once AOSP starts using the other one
+BOARD_PVMFWIMG_PARTITION_SIZE = $(BOARD_PVMFWIMAGE_PARTITION_SIZE)
+
 -include vendor/google_devices/gs101/proprietary/BoardConfigVendor.mk

device.mk

@@ -1068,9 +1068,9 @@ PRODUCT_PACKAGES += \
 	vendor.samsung_slsi.hardware.tetheroffload@1.1-service
 
 # pKVM
+$(call inherit-product, packages/modules/Virtualization/apex/product_packages.mk)
+PRODUCT_BUILD_PVMFW_IMAGE := true
 ifeq ($(TARGET_PKVM_ENABLED),true)
-    $(call inherit-product, packages/modules/Virtualization/apex/product_packages.mk)
-    PRODUCT_BUILD_PVMFW_IMAGE := true
     PRODUCT_PACKAGES += pkvm_enabler
 endif
 

fingerprint/fpc1540/sw35/fingerprint_hidl_config_factory.mk

@@ -16,6 +16,5 @@ LIBFPC_NAME=libfpcmulti_debug.a
 FPC_CONFIG_DEBUG=1
 FPC_CONFIG_ENGINEERING=1
 
-#
-# File included from device/<manufacture>/<>/<device>.mk
-# Packages to include into the build
+# Google config
+GOOGLE_CONFIG_FP_STATUS=1