From b0e72927dcba484561a0906491c0f60bf845838f Mon Sep 17 00:00:00 2001 From: Changyeon Jo Date: Thu, 30 Jan 2020 09:00:35 -0800 Subject: [PATCH] Change the location of a configuration file Move a configuration xml file from /system/etc to /vendor/etc. Bug: 148424402 Test: m -j selinux_policy Test: check violations while EVS service is running. Change-Id: I17c74798564bb0f5684157c483b45857b39ab6bd Signed-off-by: Changyeon Jo --- automotive/evs/1.1/default/Android.bp | 2 +- automotive/evs/1.1/default/EvsEnumerator.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/automotive/evs/1.1/default/Android.bp b/automotive/evs/1.1/default/Android.bp index 88fd6575ad..a7c7b4282b 100644 --- a/automotive/evs/1.1/default/Android.bp +++ b/automotive/evs/1.1/default/Android.bp @@ -41,7 +41,7 @@ cc_binary { prebuilt_etc { name: "evs_default_configuration.xml", - + soc_specific: true, src: "resources/evs_default_configuration.xml", sub_dir: "automotive/evs", } diff --git a/automotive/evs/1.1/default/EvsEnumerator.cpp b/automotive/evs/1.1/default/EvsEnumerator.cpp index a010729ce6..cb7403a7da 100644 --- a/automotive/evs/1.1/default/EvsEnumerator.cpp +++ b/automotive/evs/1.1/default/EvsEnumerator.cpp @@ -42,7 +42,7 @@ EvsEnumerator::EvsEnumerator() { // Add sample camera data to our list of cameras // In a real driver, this would be expected to can the available hardware 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()) { sCameraList.emplace_back(v.c_str()); }