From fdacb088c233b19ad715f5880e42199a1165564f Mon Sep 17 00:00:00 2001 From: Armelle Laine Date: Thu, 1 Jul 2021 03:03:30 +0000 Subject: [PATCH 1/3] Update device.mk to include trusty-storage Allows to enable Secure Storage and hardware RPMb Bug: 192512209 Test: storageproxyd service started during boot Change-Id: I9ceb5e8149c7279d5094c09982e0cac81c90871a Signed-off-by: Armelle Laine --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index a8e3a11c..6b9c4a42 100644 --- a/device.mk +++ b/device.mk @@ -749,7 +749,7 @@ PRODUCT_PACKAGES += \ endif # Trusty (KM, GK, Storage) -#$(call inherit-product, system/core/trusty/trusty-storage.mk) +$(call inherit-product, system/core/trusty/trusty-storage.mk) #$(call inherit-product, system/core/trusty/trusty-base.mk) # Trusty unit test tool From 935143f96d82f6a2a8f534d40e5bdcfb4c1d25a3 Mon Sep 17 00:00:00 2001 From: Armelle Laine Date: Wed, 14 Jul 2021 23:46:15 +0000 Subject: [PATCH 2/3] [device.mk] Enable Keymint and GateKeeper's Trusty implementation Bug: 193715461 Test: `vendor.keymint-trusty` and `vendor.gatekeeper-1-0` services up Change-Id: If49ff7daf16ef9f1dba9eedf5979d162ac96f756 Signed-off-by: Armelle Laine --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 6b9c4a42..9d72826c 100644 --- a/device.mk +++ b/device.mk @@ -750,7 +750,7 @@ endif # 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-base.mk) # Trusty unit test tool PRODUCT_PACKAGES_DEBUG += trusty-ut-ctrl From c512e22a224643b7158a59496ef76738c180968e Mon Sep 17 00:00:00 2001 From: Armelle Laine Date: Wed, 14 Jul 2021 23:55:47 +0000 Subject: [PATCH 3/3] [device.mk] Add Trusty tipc-test in debug target Bug: 193717316 Test: /data/nativetest64/vendor/tipc-test/tipc-test -t ta2ta-ipc Change-Id: Ia90b1d4e4a774fb4233903cfa831060647fa88e4 Signed-off-by: Armelle Laine --- device.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 9d72826c..9247fac1 100644 --- a/device.mk +++ b/device.mk @@ -753,7 +753,8 @@ $(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 +PRODUCT_PACKAGES_DEBUG += trusty-ut-ctrl \ + tipc-test # Trusty ConfirmationUI HAL #PRODUCT_PACKAGES += \