From 2496a78bdf329ac0496e12bb7a89a405b2b640de Mon Sep 17 00:00:00 2001
From: Andrew Scull <ascull@google.com>
Date: Mon, 7 Jun 2021 12:21:03 +0000
Subject: [PATCH] Enable pKVM be default

Include the com.android.virt APEX in the cloudripper image to bundle the
pKVM user space components.

Test: atest VirtualizationTestCases
Bug: 181324461
Change-Id: If84c957b74dc59faefc88edf6b7f500894eef38b
---
 device.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/device.mk b/device.mk
index c62d8e18..1430634e 100644
--- a/device.mk
+++ b/device.mk
@@ -1114,9 +1114,7 @@ PRODUCT_PACKAGES += \
 	vendor.samsung_slsi.hardware.tetheroffload@1.0-service
 
 # pKVM
-ifeq ($(TARGET_PKVM_ENABLED),true)
-    $(call inherit-product, packages/modules/Virtualization/apex/product_packages.mk)
-endif
+$(call inherit-product, packages/modules/Virtualization/apex/product_packages.mk)
 
 # Enable watchdog timeout loop breaker.
 PRODUCT_PROPERTY_OVERRIDES += \