commit 625b010c8aba0870c23998b9ccabec5cd4fbb862
author David Brazdil <dbrazdil@google.com> Fri Oct 08 09:57:45 2021 +0000
committer David Brazdil <dbrazdil@google.com> Tue Oct 12 09:31:30 2021 +0000
tree a03661168ab9f1ea75adf2d5ca0ee2cc1f3e3731
parent bee19e91ddfc62080bfe9525cf79e0f48a107e82

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

diff --git a/device.mk b/device.mk
index 18d8d23..57456d2 100644
--- a/device.mk
+++ b/device.mk
@@ -1068,9 +1068,9 @@
 	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