g12-common: Skip keymaster vendor deps unless target has TEE
authorBruno Martins <bgcngm@gmail.com>
Wed, 4 Oct 2023 09:15:18 +0000 (10:15 +0100)
committerBruno Martins <bgcngm@gmail.com>
Wed, 4 Oct 2023 09:29:54 +0000 (09:29 +0000)
Change-Id: I23bd70cc1c10f509e259d9c624702c0f1d1c4725

g12.mk

diff --git a/g12.mk b/g12.mk
index e9c978e61f05e751dffb4e3df1f195a549d27629..3739373c741730a8218d85e4963af58472c08418 100644 (file)
--- a/g12.mk
+++ b/g12.mk
@@ -95,6 +95,7 @@ PRODUCT_PACKAGES += \
     optee-module
 
 ## Keymaster
+ifeq ($(TARGET_HAS_TEE),true)
 PRODUCT_PACKAGES += \
     android.hardware.hardware_keystore.xml \
     lib_android_keymaster_keymint_utils.vendor \
@@ -106,8 +107,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