Merge 41eca4930d25a9a4ad269eab09eb80826ee2bae1 on remote branch
Change-Id: I7bfa8af17a8a6890caa53263fea2e61642de9612
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 @@
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;
}