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:26:00 +0000 (10:26 +0100)
Change-Id: I23bd70cc1c10f509e259d9c624702c0f1d1c4725

g12.mk

diff --git a/g12.mk b/g12.mk
index ee51a24262d401a575bb4379bb0d8a018516629a..1a3572def3dc1b61c222676555b5b58b8a103c11 100644 (file)
--- 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