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 0000000000000000000000000000000000000000..9ef253ba3f2413b138b72ff8a8019d50fef2e4aa --- /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 +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 +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/tc_swr.mk b/tc/tc_swr.mk index 5a4dce63ca8f8a5497041bbb95fb721f97d4c50a..e7ab1a8610098822baec6ff0d8f706c81c0b0526 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 diff --git a/tc/vendorsetup.sh b/tc/vendorsetup.sh index b9c6f1ee6c1f47c711a9c42589cdf6c44fc957cd..e4ba7d269791d1a0e44edb1c76c12081c4842073 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"