Merge "Change the location of a configuration file"

This commit is contained in:
TreeHugger Robot 2020-01-30 21:02:21 +00:00 committed by Android (Google) Code Review
commit 87880e82d0
2 changed files with 2 additions and 2 deletions

View file

@ -41,7 +41,7 @@ cc_binary {
prebuilt_etc { prebuilt_etc {
name: "evs_default_configuration.xml", name: "evs_default_configuration.xml",
soc_specific: true,
src: "resources/evs_default_configuration.xml", src: "resources/evs_default_configuration.xml",
sub_dir: "automotive/evs", sub_dir: "automotive/evs",
} }

View file

@ -42,7 +42,7 @@ EvsEnumerator::EvsEnumerator() {
// Add sample camera data to our list of cameras // Add sample camera data to our list of cameras
// In a real driver, this would be expected to can the available hardware // In a real driver, this would be expected to can the available hardware
sConfigManager = sConfigManager =
ConfigManager::Create("/etc/automotive/evs/evs_sample_configuration.xml"); ConfigManager::Create("/vendor/etc/automotive/evs/evs_default_configuration.xml");
for (auto v : sConfigManager->getCameraList()) { for (auto v : sConfigManager->getCameraList()) {
sCameraList.emplace_back(v.c_str()); sCameraList.emplace_back(v.c_str());
} }