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

Commit fa5cbeaa authored by Myles Watson's avatar Myles Watson Committed by android-build-merger
Browse files

RootCanal: Remove dependency on btm am: 2001f070 

am: d6a7553e

Change-Id: I2e60f167c553fcf55c38dafb477c73f9bb4059ed
parents a3093484 d6a7553e

system/vendor_libs/test_vendor_lib/Android.bp

+0 −13
Original line number Original line Diff line number Diff line
@@ -47,15 +47,8 @@ cc_library_static { 
        "include",

        "include",

        ".",

        ".",

    ],

    ],

    header_libs: [

        "libbluetooth_headers",

    ],

    include_dirs: [

    include_dirs: [

        "packages/modules/Bluetooth/system",

        "packages/modules/Bluetooth/system",

        "packages/modules/Bluetooth/system/utils/include",

        "packages/modules/Bluetooth/system/hci/include",

        "packages/modules/Bluetooth/system/internal_include",

        "packages/modules/Bluetooth/system/stack/include",

    ],

    ],

    shared_libs: [

    shared_libs: [

        "libbase",

        "libbase",
@@ -90,9 +83,6 @@ cc_test_host { 
    ],

    ],

    include_dirs: [

    include_dirs: [

        "packages/modules/Bluetooth/system",

        "packages/modules/Bluetooth/system",

        "packages/modules/Bluetooth/system/utils/include",

        "packages/modules/Bluetooth/system/hci/include",

        "packages/modules/Bluetooth/system/stack/include",

    ],

    ],

    shared_libs: [

    shared_libs: [

        "liblog",

        "liblog",
@@ -126,9 +116,6 @@ cc_test_host { 
    ],

    ],

    include_dirs: [

    include_dirs: [

        "packages/modules/Bluetooth/system",

        "packages/modules/Bluetooth/system",

        "packages/modules/Bluetooth/system/utils/include",

        "packages/modules/Bluetooth/system/hci/include",

        "packages/modules/Bluetooth/system/stack/include",

    ],

    ],

    shared_libs: [

    shared_libs: [

        "liblog",

        "liblog",

system/vendor_libs/test_vendor_lib/desktop/root_canal_main.cc

+0 −2
Original line number Original line Diff line number Diff line
@@ -22,8 +22,6 @@ 
#include <utils/Log.h>

#include <utils/Log.h>

#include <future>

#include <future>





#include "hci_internals.h"



using ::android::bluetooth::root_canal::TestEnvironment;

using ::android::bluetooth::root_canal::TestEnvironment;





constexpr uint16_t kTestPort = 6401;

constexpr uint16_t kTestPort = 6401;

system/vendor_libs/test_vendor_lib/desktop/test_environment.cc

+0 −2
Original line number Original line Diff line number Diff line
@@ -24,8 +24,6 @@ 
#include <string.h>

#include <string.h>

#include <utils/Log.h>

#include <utils/Log.h>





#include "hci_internals.h"



namespace android {

namespace android {

namespace bluetooth {

namespace bluetooth {

namespace root_canal {

namespace root_canal {

system/vendor_libs/test_vendor_lib/include/hci.h

+5 −0
Original line number Original line Diff line number Diff line
@@ -59,5 +59,10 @@ enum class Version : uint8_t { 
  V5_0 = 9,

  V5_0 = 9,

};

};





enum class Role : uint8_t {

  MASTER = 0x00,

  SLAVE = 0x01,

};



}  // namespace hci

}  // namespace hci

}  // namespace test_vendor_lib
 
}  // namespace test_vendor_lib

system/vendor_libs/test_vendor_lib/model/devices/beacon.cc

+4 −5
Original line number Original line Diff line number Diff line
@@ -18,7 +18,6 @@ 




#include "beacon.h"

#include "beacon.h"





#include "le_advertisement.h"

#include "model/setup/device_boutique.h"

#include "model/setup/device_boutique.h"

#include "osi/include/log.h"

#include "osi/include/log.h"
@@ -30,15 +29,15 @@ bool Beacon::registered_ = DeviceBoutique::Register(LOG_TAG, &Beacon::Create); 




Beacon::Beacon() {

Beacon::Beacon() {

  advertising_interval_ms_ = std::chrono::milliseconds(1280);

  advertising_interval_ms_ = std::chrono::milliseconds(1280);

  properties_.SetLeAdvertisementType(BTM_BLE_NON_CONNECT_EVT);

  properties_.SetLeAdvertisementType(0x03 /* NON_CONNECT */);

  properties_.SetLeAdvertisement({0x0F,  // Length

  properties_.SetLeAdvertisement({0x0F,  // Length

                                  BTM_BLE_AD_TYPE_NAME_CMPL, 'g', 'D', 'e', 'v', 'i', 'c', 'e', '-', 'b', 'e', 'a', 'c',

                                  0x09 /* TYPE_NAME_CMPL */, 'g', 'D', 'e', 'v', 'i', 'c', 'e', '-', 'b', 'e', 'a', 'c',

                                  'o', 'n',

                                  'o', 'n',

                                  0x02,  // Length

                                  0x02,  // Length

                                  BTM_BLE_AD_TYPE_FLAG, BTM_BLE_BREDR_NOT_SPT | BTM_BLE_GEN_DISC_FLAG});

                                  0x01 /* TYPE_FLAG */, 0x4 /* BREDR_NOT_SPT */ | 0x2 /* GEN_DISC_FLAG */});





  properties_.SetLeScanResponse({0x05,  // Length

  properties_.SetLeScanResponse({0x05,  // Length

                                 BTM_BLE_AD_TYPE_NAME_SHORT, 'b', 'e', 'a', 'c'});

                                 0x08 /* TYPE_NAME_SHORT */, 'b', 'e', 'a', 'c'});

}

}





std::string Beacon::GetTypeString() const {

std::string Beacon::GetTypeString() const {