Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed90788a authored by Jorge E. Moreira's avatar Jorge E. Moreira Committed by android-build-merger
Browse files

Merge "Move controller_properties.json to the vendor image" am: 5cd29a05 

am: 05f19c62

Change-Id: Ib1d0ed526be24bcd4f33ea487eefc5f4c3f012d9
parents af9c0a61 05f19c62

system/vendor_libs/test_vendor_lib/scripts/build_and_run.sh

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ else 
  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/

system/vendor_libs/test_vendor_lib/src/dual_mode_controller.cc

+1 −2
Original line number Diff line number Diff line
@@ -41,8 +41,7 @@ const uint8_t kSuccessStatus = 0; 
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);