From 2908323e75a39e37db9ae092c16df4690f8136c7 Mon Sep 17 00:00:00 2001
From: Bruno Martins <bgcngm@gmail.com>
Date: Wed, 4 Oct 2023 10:15:18 +0100
Subject: [PATCH] g12-common: Skip keymaster vendor deps unless target has TEE

Change-Id: I23bd70cc1c10f509e259d9c624702c0f1d1c4725
---
 g12.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/g12.mk b/g12.mk
index ee51a24..1a3572d 100644
--- a/g12.mk
+++ b/g12.mk
@@ -100,6 +100,7 @@ PRODUCT_PACKAGES += \
     optee-module
 
 ## Keymaster
+ifeq ($(TARGET_HAS_TEE),true)
 PRODUCT_PACKAGES += \
     android.hardware.security.keymint-V1-ndk_platform.vendor \
     android.hardware.security.secureclock-V1-ndk_platform.vendor \
@@ -113,8 +114,7 @@ PRODUCT_PACKAGES += \
     libshmemcompat.vendor \
     libsoft_attestation_cert.vendor \
     libtrusty.vendor
-
-ifeq ($(TARGET_HAS_TEE),false)
+else
 PRODUCT_PACKAGES += \
     android.hardware.keymaster@4.1-service
 endif
-- 
2.20.1