From 93d9ad928b7d82f04990aa1e91be7919ac8bf460 Mon Sep 17 00:00:00 2001
From: Armelle Laine <armellel@google.com>
Date: Sun, 5 Feb 2023 22:43:23 +0000
Subject: [PATCH 1/2] trusty: Add trusty_stats_test

Test: /data/nativetest64/vendor/trusty_stats_test/trusty_stats_test
Bug: 276821220
Change-Id: If3ad0e5eec831a8f5632504453994f29f350224c
(cherry picked from commit 1e26affe87302e85d458c3a6caf3b06972ad32c8)
---
 device.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/device.mk b/device.mk
index 79d586e6..52c29b1a 100644
--- a/device.mk
+++ b/device.mk
@@ -826,8 +826,10 @@ $(call inherit-product, system/core/trusty/trusty-base.mk)
 include device/google/gs-common/trusty/trusty.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
 

From dba3d2f31cf102f6b59ccab03b2e9e5451b2d40d Mon Sep 17 00:00:00 2001
From: Armelle Laine <armellel@google.com>
Date: Mon, 12 Dec 2022 01:08:09 +0000
Subject: [PATCH 2/2] Add metrics to the gs201 makefile

Bug: 276821220
Test: /vendor/bin/trusty-ut-ctrl -D /dev/trusty-ipc-dev0 "com.android.trusty.crashtest"
Change-Id: I516129e1edd537f47d35e54834fdcdc96bab5354
(cherry picked from commit e573bfd11ff2680f5b645a8c260faf3e712f5f49)
---
 device.mk | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/device.mk b/device.mk
index 52c29b1a..bb2041fd 100644
--- a/device.mk
+++ b/device.mk
@@ -838,11 +838,11 @@ PRODUCT_PACKAGES += \
 	securedpud.slider
 
 # 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,gs201)
 PRODUCT_PACKAGES += \