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

Commit fb28f846 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix net_test_bluetooth"

parents 12b25c5d 7d7591de

system/btcore/src/hal_util.cc

+1 −1
Original line number Original line Diff line number Diff line
@@ -34,7 +34,7 @@ 




// TODO(armansito): It might be better to pass the library name in a more

// TODO(armansito): It might be better to pass the library name in a more

// generic manner as opposed to hard-coding it here.

// generic manner as opposed to hard-coding it here.

static const char kBluetoothLibraryName[] = "libbluetooth.default.so";

static const char kBluetoothLibraryName[] = "bluetooth.default.so";





int hal_util_load_bt_library(const struct hw_module_t** module) {

int hal_util_load_bt_library(const struct hw_module_t** module) {

  const char* id = BT_STACK_MODULE_ID;

  const char* id = BT_STACK_MODULE_ID;

system/test/run_unit_tests.sh

+1 −1
Original line number Original line Diff line number Diff line
@@ -109,7 +109,7 @@ do 
  binary="/data/nativetest/${name}/${name}"

  binary="/data/nativetest/${name}/${name}"





  push_command=( "${adb[@]}" push {"${ANDROID_PRODUCT_OUT}",}"${binary}" )

  push_command=( "${adb[@]}" push {"${ANDROID_PRODUCT_OUT}",}"${binary}" )

  test_command=( "${adb[@]}" shell "${binary}" )

  test_command=( "${adb[@]}" shell "LD_LIBRARY_PATH=/system/lib/hw:$LD_LIBRARY_PATH ${binary}" )

  if [ "${name}" != "${spec}" ]; then

  if [ "${name}" != "${spec}" ]; then

    filter="${spec#*.}"

    filter="${spec#*.}"

    test_command+=( "--gtest_filter=${filter}" )

    test_command+=( "--gtest_filter=${filter}" )