summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-12-14 11:08:20 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-12-14 11:08:20 +0000
commit41eca4930d25a9a4ad269eab09eb80826ee2bae1 (patch)
tree751da8be5ec0fff42a9c72f9ec45668c599179d1
parentf66837cb5e753e690d9de9266402154482f14504 (diff)
parent41d0acf9bf6b77701c1ae9466247d1f601e69170 (diff)
Snap for 9403421 from 41d0acf9bf6b77701c1ae9466247d1f601e69170 to t-keystone-qcom-release
Change-Id: I646b81e18088a426ec3aaaa3271887e3ce5fac89
-rw-r--r--src/apps_std_imp.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/apps_std_imp.c b/src/apps_std_imp.c
index d2559c6..eb49755 100644
--- a/src/apps_std_imp.c
+++ b/src/apps_std_imp.c
@@ -82,6 +82,10 @@
#define ION_HEAP_ID_QSEECOM 27
+#define OEM_CONFIG_FILE_NAME "oemconfig.so"
+#define TESTSIG_FILE_NAME "testsig"
+#define RPC_VERSION_FILE_NAME "librpcversion_skel.so"
+
#define FREEIF(pv) \
do {\
if(pv) { \
@@ -746,7 +750,11 @@ bail:
FREEIF(absName);
FREEIF(dirListBuf);
if (nErr != AEE_SUCCESS) {
- VERIFY_IPRINTF("Error %x: fopen failed for %s. (%s)", nErr, name, strerror(ERRNO));
+ if (ERRNO != ENOENT ||
+ (std_strncmp(name, OEM_CONFIG_FILE_NAME, std_strlen(OEM_CONFIG_FILE_NAME)) != 0
+ && std_strncmp(name, RPC_VERSION_FILE_NAME, std_strlen(RPC_VERSION_FILE_NAME)) != 0
+ && std_strncmp(name, TESTSIG_FILE_NAME, std_strlen(TESTSIG_FILE_NAME)) != 0))
+ VERIFY_IPRINTF("Error %x: fopen failed for %s. (%s)", nErr, name, strerror(ERRNO));
}
return nErr;
}