From c9a165abf39c12d0ddf74e3bbe5c64895188df5e Mon Sep 17 00:00:00 2001
From: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
Date: Fri, 29 Apr 2022 19:48:01 +0100
Subject: [PATCH 1/2] Add patch to trusty tipc-test binary path

This patch installs tipc-test to /vendor/bin directory

Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
Change-Id: I4c0ed316685693479097fb297a83d36a4d020f26
---
 ...01-trusty-tipc-test-copy-in-bin-path.patch | 38 +++++++++++++++++++
 tc/vendorsetup.sh                             |  3 ++
 2 files changed, 41 insertions(+)
 create mode 100644 tc/patches/0001-trusty-tipc-test-copy-in-bin-path.patch

diff --git a/tc/patches/0001-trusty-tipc-test-copy-in-bin-path.patch b/tc/patches/0001-trusty-tipc-test-copy-in-bin-path.patch
new file mode 100644
index 0000000..9ef253b
--- /dev/null
+++ b/tc/patches/0001-trusty-tipc-test-copy-in-bin-path.patch
@@ -0,0 +1,38 @@
+From 9b258d21cf51b85b91fd0cfd2c179667f9324397 Mon Sep 17 00:00:00 2001
+From: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
+Date: Fri, 29 Apr 2022 17:35:16 +0100
+Subject: [PATCH] trusty:tipc-test: copy in bin path
+
+This change installs tipc-test to /vendor/bin directory, which is in
+PATH env variable.
+
+Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
+Change-Id: I977fbef4f2e447b5776c0491100042d134d850ca
+---
+ trusty/libtrusty/tipc-test/Android.bp | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/trusty/libtrusty/tipc-test/Android.bp b/trusty/libtrusty/tipc-test/Android.bp
+index c7a8ae1cf..ad0627d15 100644
+--- a/trusty/libtrusty/tipc-test/Android.bp
++++ b/trusty/libtrusty/tipc-test/Android.bp
+@@ -16,7 +16,7 @@ package {
+     default_applicable_licenses: ["Android-Apache-2.0"],
+ }
+ 
+-cc_test {
++cc_binary {
+     name: "tipc-test",
+     vendor: true,
+ 
+@@ -27,7 +27,6 @@ cc_test {
+         "liblog",
+         "libtrusty",
+     ],
+-    gtest: false,
+     cflags: [
+         "-Wall",
+         "-Werror",
+-- 
+2.30.2
+
diff --git a/tc/vendorsetup.sh b/tc/vendorsetup.sh
index b9c6f1e..e4ba7d2 100644
--- a/tc/vendorsetup.sh
+++ b/tc/vendorsetup.sh
@@ -46,3 +46,6 @@ apply_patch "system/extras" "0004-simpleperf-Add-support-for-new-perf-ETE-files.
 
 # Backported patch to enable ETE in OpenCSD
 apply_patch "external/OpenCSD" "0001-Add-ETE-decoder-to-the-Android-build.patch"
+
+# Patch to copy trusty tipc-test in /vendor/bin path
+apply_patch "system/core" "0001-trusty-tipc-test-copy-in-bin-path.patch"
-- 
GitLab


From 9be2991de1a3af74b44a69a4bfa62db5c3e347ff Mon Sep 17 00:00:00 2001
From: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
Date: Tue, 12 Apr 2022 18:06:22 +0100
Subject: [PATCH 2/2] Add trusty test

Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
Change-Id: I66bfaac2de13eb8a3a050d7450af67bf13d74a62
---
 tc/tc_swr.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tc/tc_swr.mk b/tc/tc_swr.mk
index 5a4dce6..e7ab1a8 100644
--- a/tc/tc_swr.mk
+++ b/tc/tc_swr.mk
@@ -17,6 +17,7 @@
 $(call inherit-product, $(LOCAL_PATH)/device.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
+$(call inherit-product, system/core/trusty/trusty-test.mk)
 
 PRODUCT_NAME := tc_swr
 PRODUCT_MANUFACTURER := Arm
@@ -55,7 +56,9 @@ PRODUCT_PACKAGES += \
     android.hardware.broadcastradio@1.0-impl \
     \
     gralloc.minigbm \
-    hwcomposer.drm_minigbm
+    hwcomposer.drm_minigbm \
+    \
+    tipc-test
 
 # Audio Policy Configurations
 FW_AV_AUDIOPOLICY_CFG_PATH := frameworks/av/services/audiopolicy/config
-- 
GitLab