From 01459cea67629c5f4a21209bff9c4b6008479ee7 Mon Sep 17 00:00:00 2001 From: eddielan Date: Fri, 8 Oct 2021 14:57:04 +0800 Subject: [PATCH 1/4] fingerprint: Enable HIDL fingerprint status flag Bug: 202485883 Test: Bulid Pass, getprop vendor.fp.status Change-Id: I67d39a91c24e3d91a029422fd8860de6d74a8422 --- fingerprint/fpc1540/sw35/fingerprint_hidl_config_factory.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fingerprint/fpc1540/sw35/fingerprint_hidl_config_factory.mk b/fingerprint/fpc1540/sw35/fingerprint_hidl_config_factory.mk index 2c467f28..72ef96ce 100644 --- a/fingerprint/fpc1540/sw35/fingerprint_hidl_config_factory.mk +++ b/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//<>/.mk -# Packages to include into the build +# Google config +GOOGLE_CONFIG_FP_STATUS=1 From 625b010c8aba0870c23998b9ccabec5cd4fbb862 Mon Sep 17 00:00:00 2001 From: David Brazdil Date: Fri, 8 Oct 2021 09:57:45 +0000 Subject: [PATCH 2/4] pKVM: Include pvmfw and virt APEX in gs101 builds Support for pKVM is being added to all gs101 builds starting with T, disabled by default. So far, the userspace components have been included only in special _pkvm builds. Include them unconditionally. This adds 89MB to the size of the system image. Bug: 192819132 Test: flash, check /apex/com.android.virt exists Change-Id: Iefd7e1dc5e0c1f23ff66e8b282c94a3b85f7cc3e --- device.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/device.mk b/device.mk index 18d8d236..57456d2d 100644 --- a/device.mk +++ b/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 From efcaa740adc4ec2364a7598ee9aab70728255ca3 Mon Sep 17 00:00:00 2001 From: David Brazdil Date: Tue, 12 Oct 2021 13:18:18 +0000 Subject: [PATCH 3/4] Revert "pKVM: Include pvmfw and virt APEX in gs101 builds" Revert "Include pvmfw variables in all gs101 builds" Revert submission 16007088-pkvm-apex-gs101 Reason for revert: Fails on checkouts without vendor Reverted Changes: I238181780:Include pvmfw variables in all gs101 builds Iefd7e1dc5:pKVM: Include pvmfw and virt APEX in gs101 builds Bug: 202827425 Bug: 192819132 Change-Id: I08b0b2ac09f68847ad9bfabc39423de408fa6632 --- device.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/device.mk b/device.mk index 57456d2d..18d8d236 100644 --- a/device.mk +++ b/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 From ae3c59fc0bfeabe793af787c372a3da6220ebfc1 Mon Sep 17 00:00:00 2001 From: David Brazdil Date: Tue, 12 Oct 2021 16:09:56 +0000 Subject: [PATCH 4/4] Revert^2: pKVM: Include pvmfw and virt APEX in gs101 builds Support for pKVM is being added to all gs101 builds starting with T, disabled by default. So far, the userspace components have been included only in special _pkvm builds. Include them unconditionally. Also move BOARD_* variables specifying location and partition size of pvmfw from vendor board config file here. This adds 89MB to the size of the system image. Bug: 192819132 Test: build a gs101 target, check /apex/com.android.virt exists Change-Id: Ie46b0ad5f45bd4757570b72cb275d002df7b4616 --- BoardConfig-common.mk | 6 ++++++ device.mk | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index d0d62790..18d0a405 100644 --- a/BoardConfig-common.mk +++ b/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 diff --git a/device.mk b/device.mk index 18d8d236..57456d2d 100644 --- a/device.mk +++ b/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