Add vendor/etc to config search path
libnfc-nci.conf has hardware specific configurations.
Hardware dependent module should be placed in vendor or odm partition.
But a device launched with N or O, it might not have odm partition.
If the config exists in vendor partition,
it should be allowed to load from there.
Bug: 72080121
Bug: 77544383
Test: Put libnfc-nci.conf in vendor/etc and load the conf
Change-Id: I73158c3c8706f08e844ca81a801c887472b7882b
(cherry picked from commit 8dfc10210a8f4f1e886ff16275cebd513de5ab9d)
diff --git a/src/adaptation/nfc_config.cc b/src/adaptation/nfc_config.cc
index f18e450..5891cc4 100644
--- a/src/adaptation/nfc_config.cc
+++ b/src/adaptation/nfc_config.cc
@@ -29,7 +29,8 @@
namespace {
std::string findConfigPath() {
- const vector<string> search_path = {"/odm/etc/", "/product/etc/", "/etc/"};
+ const vector<string> search_path = {"/odm/etc/", "/vendor/etc/",
+ "/product/etc/", "/etc/"};
const string file_name = "libnfc-nci.conf";
for (string path : search_path) {