From 595a0f7c209abd2f24c3e315c6ab602edeea6bf6 Mon Sep 17 00:00:00 2001 From: Yi-Yo Chiang Date: Tue, 11 Oct 2022 19:39:14 +0800 Subject: [PATCH] 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: Iad14c8627e2807ef5ab2930ba9ed3626c77f9aa7 --- target/product/aosp_arm64.mk | 3 +++ target/product/aosp_x86_64.mk | 3 +++ 2 files changed, 6 insertions(+) diff --git a/target/product/aosp_arm64.mk b/target/product/aosp_arm64.mk index 01897b77d2..ffc37a9bd2 100644 --- a/target/product/aosp_arm64.mk +++ b/target/product/aosp_arm64.mk @@ -43,6 +43,9 @@ endif $(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system_ext.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_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/target/product/aosp_x86_64.mk b/target/product/aosp_x86_64.mk index b3cfae4385..d55866f4ec 100644 --- a/target/product/aosp_x86_64.mk +++ b/target/product/aosp_x86_64.mk @@ -45,6 +45,9 @@ endif $(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system_ext.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk) +# pKVM +$(call inherit-product, packages/modules/Virtualization/apex/product_packages.mk) + # # All components inherited here go to product image #