From 43f7439f43b9fd974f4e83ce21c1c898e1ba53a2 Mon Sep 17 00:00:00 2001 From: Armelle Laine Date: Tue, 28 Feb 2023 02:44:10 +0000 Subject: [PATCH 1/2] Add metrics to the zuma makefile Bug: 259517277 Test: TBD Change-Id: I4423c4df03a34d68dcec81a1ffc1f00e28fb685b --- device.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/device.mk b/device.mk index 663a92e2..cf26289b 100644 --- a/device.mk +++ b/device.mk @@ -786,11 +786,11 @@ PRODUCT_PACKAGES_DEBUG += trusty-ut-ctrl \ include device/google/gs101/confirmationui/confirmationui.mk # Trusty Metrics Daemon -#PRODUCT_SOONG_NAMESPACES += \ -# vendor/google/trusty/common -# -#PRODUCT_PACKAGES += \ -# trusty_metricsd +PRODUCT_SOONG_NAMESPACES += \ + vendor/google/trusty/common + +PRODUCT_PACKAGES += \ + trusty_metricsd $(call soong_config_set,google_displaycolor,displaycolor_platform,zuma) PRODUCT_PACKAGES += \ From 473839b618c7b5098c0b8fc213470143d6080c80 Mon Sep 17 00:00:00 2001 From: Armelle Laine Date: Tue, 28 Feb 2023 02:47:02 +0000 Subject: [PATCH 2/2] trusty: Add trusty_stats_test Test: /data/nativetest64/vendor/trusty_stats_test/trusty_stats_test Bug: 259517277 Change-Id: I40eba69428df1b577456ab6a79f5ffc634fec9ac --- device.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/device.mk b/device.mk index cf26289b..557afdb1 100644 --- a/device.mk +++ b/device.mk @@ -780,8 +780,10 @@ $(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 +PRODUCT_PACKAGES_DEBUG += \ + trusty-ut-ctrl \ + tipc-test \ + trusty_stats_test \ include device/google/gs101/confirmationui/confirmationui.mk