From fce9c61d9c2c73ae5a5c842b19f109e54dc6b7b1 Mon Sep 17 00:00:00 2001 From: Jerry Pai Date: Thu, 6 Jul 2023 02:39:54 +0000 Subject: [PATCH] Revert "Revert "Re-enable trusty for udfps."" This reverts commit 883fbbb0ed7736aad2658e490c94dccf212105cf. Reason for revert: make udfps work when trusty is ready Bug: 288807909 Change-Id: Iee6c2b96212539ebc235e18b3a762023ed7c572e --- device.mk | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/device.mk b/device.mk index cd8d249..1c17e66 100644 --- a/device.mk +++ b/device.mk @@ -796,31 +796,24 @@ PRODUCT_PACKAGES += \ libopenvx-opencl endif -# TODO[b/279647242]: Re-enable Trusty and disable this when Trusty is working -PRODUCT_PACKAGES += \ - android.hardware.keymaster@4.1-service \ - android.hardware.gatekeeper@1.0-service.software -LOCAL_KEYMASTER_PRODUCT_PACKAGE := android.hardware.keymaster@4.1-service -LOCAL_GATEKEEPER_PRODUCT_PACKAGE := android.hardware.gatekeeper@1.0-service.software - # Trusty (KM, GK, Storage) -#$(call inherit-product, system/core/trusty/trusty-storage.mk) -#$(call inherit-product, system/core/trusty/trusty-base.mk) +$(call inherit-product, system/core/trusty/trusty-storage.mk) +$(call inherit-product, system/core/trusty/trusty-base.mk) # Trusty unit test tool -# PRODUCT_PACKAGES_DEBUG += \ -# trusty-ut-ctrl \ -# tipc-test \ -# trusty_stats_test \ + PRODUCT_PACKAGES_DEBUG += \ + trusty-ut-ctrl \ + tipc-test \ + trusty_stats_test \ #include device/google/gs101/confirmationui/confirmationui.mk # Trusty Metrics Daemon -# PRODUCT_SOONG_NAMESPACES += \ -# vendor/google/trusty/common +PRODUCT_SOONG_NAMESPACES += \ + vendor/google/trusty/common -#PRODUCT_PACKAGES += \ -# trusty_metricsd +PRODUCT_PACKAGES += \ + trusty_metricsd # TODO(b/272725898): Needs to check with owner later $(warning displaycolor_platform set to zuma on zumapro target)