Move controller_properties.json to the vendor image
Bug: 128355308
Test: build
Change-Id: I3cb9140b34af18569a983122eef3bd642516440c
diff --git a/vendor_libs/test_vendor_lib/scripts/build_and_run.sh b/vendor_libs/test_vendor_lib/scripts/build_and_run.sh
index 34e0cfe..987a17f 100755
--- a/vendor_libs/test_vendor_lib/scripts/build_and_run.sh
+++ b/vendor_libs/test_vendor_lib/scripts/build_and_run.sh
@@ -108,7 +108,7 @@
adb push ${VENDOR_SYMBOLS_ABS}/${VENDOR_LIB} /vendor/lib
echo "Pushing controller properties."
- adb push ${TEST_VENDOR_LIB_ABS}/data/${CONTROLLER_PROPERTIES} /etc/bluetooth/
+ adb push ${TEST_VENDOR_LIB_ABS}/data/${CONTROLLER_PROPERTIES} /vendor/etc/bluetooth/
echo "Pushing libevent."
adb push ${DEVICE_TARGET_ABS}/${DEVICE}/system/lib/libevent.so /system/lib/
diff --git a/vendor_libs/test_vendor_lib/src/dual_mode_controller.cc b/vendor_libs/test_vendor_lib/src/dual_mode_controller.cc
index bc80866..a7763a7 100644
--- a/vendor_libs/test_vendor_lib/src/dual_mode_controller.cc
+++ b/vendor_libs/test_vendor_lib/src/dual_mode_controller.cc
@@ -41,8 +41,7 @@
const uint8_t kUnknownHciCommand = 1;
// The location of the config file loaded to populate controller attributes.
-const std::string kControllerPropertiesFile =
- "/etc/bluetooth/controller_properties.json";
+const std::string kControllerPropertiesFile = "/vendor/etc/bluetooth/controller_properties.json";
void LogCommand(const char* command) {
LOG_INFO(LOG_TAG, "Controller performing command: %s", command);
