aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYi-Yo Chiang <yochiang@google.com>2022-10-13 17:49:22 +0800
committerYi-Yo Chiang <yochiang@google.com>2022-10-13 17:49:22 +0800
commit6c9e2b36fded52bbb4ae273d1ec6b0aa211a8445 (patch)
tree435202b88b249f2d3e55adbf3187b7f64181bf6a
parent489cdacaec3fc62ab7a3964efaea221c8e2230c0 (diff)
downloadcommon-6c9e2b36fded52bbb4ae273d1ec6b0aa211a8445.tar.gz
Add virt APEX to arm64 & x86_64 GSI
Bug: 252441099 Test: Install GSI (MASTER) on Pixel 6a (TM) && fastboot oem pkvm enable Test: atest VirtualizationTestCases.64 Test: atest MicrodroidHostTestCases Test: atest MicrodroidTestApp Change-Id: Id0ef2c734be28fcc7f17b85c99f131467db6abf5
-rw-r--r--gsi_arm64.mk3
-rw-r--r--gsi_x86_64.mk3
2 files changed, 6 insertions, 0 deletions
diff --git a/gsi_arm64.mk b/gsi_arm64.mk
index d792cd9..81b0a3e 100644
--- a/gsi_arm64.mk
+++ b/gsi_arm64.mk
@@ -35,6 +35,9 @@ PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := true
#
$(call inherit-product, device/generic/common/gsi_system_ext.mk)
+# pKVM
+$(call inherit-product, packages/modules/Virtualization/apex/product_packages.mk)
+
#
# All components inherited here go to product image
#
diff --git a/gsi_x86_64.mk b/gsi_x86_64.mk
index eb5bd97..b45184c 100644
--- a/gsi_x86_64.mk
+++ b/gsi_x86_64.mk
@@ -28,6 +28,9 @@ PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := true
#
$(call inherit-product, device/generic/common/gsi_system_ext.mk)
+# pKVM
+$(call inherit-product, packages/modules/Virtualization/apex/product_packages.mk)
+
#
# All components below go to product image
#