commit efcaa740adc4ec2364a7598ee9aab70728255ca3
author David Brazdil <dbrazdil@google.com> Tue Oct 12 13:18:18 2021 +0000
committer David Brazdil <dbrazdil@google.com> Tue Oct 12 13:21:18 2021 +0000
tree de1424a6f8e60c81728b0355b00342ba28803a85
parent 625b010c8aba0870c23998b9ccabec5cd4fbb862

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

diff --git a/device.mk b/device.mk
index 57456d2..18d8d23 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