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

Commit 28f64372 authored by Chris Manton's avatar Chris Manton
Browse files

Rearrange shim layer libs for testing 

Bug: 146367779
Test: bluetooth_test_legacy
Change-Id: I1d823fe28c7de73503cd9628ec8b29a49799d75e
parent bd6cb75e

system/btif/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -174,6 +174,7 @@ cc_test { 
        "libbluetooth-types",

        "libosi",

        "libbt-protos-lite",

        "libbluetooth-gd-stub",

    ],

    whole_static_libs: [

        "libbtif",

system/main/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,6 @@ cc_library_static { 
    srcs: [

        ":LibBluetoothSources",

        ":LibBluetoothShimSources",

        ":LibBluetoothShimTestEntrySources",

    ],

    host_supported: true,

    include_dirs: [
@@ -140,6 +139,7 @@ cc_test { 
    host_supported: true,

    srcs: [

        ":LibBluetoothShimTestSources",

        ":LibBluetoothShimStubSources",

    ],

    static_libs: [

        "libgmock",

system/main/shim/Android.bp

+0 −9
Original line number Diff line number Diff line
@@ -16,15 +16,6 @@ filegroup { 
    name: "LibBluetoothShimTestSources",

    srcs: [

        "l2cap_test.cc",

        "test_stack.cc",

    ]

}



// Stubbed out fake entry point for the gd stack

filegroup {

    name: "LibBluetoothShimTestEntrySources",

    srcs: [

        "entry_for_test.cc",

    ]

}

system/main/shim/l2cap_test.cc

+1 −7
Original line number Diff line number Diff line
@@ -21,15 +21,9 @@ 


#include "osi/include/log.h"

#include "shim/l2cap.h"

#include "shim/test_stack.h"

#include "shim/stub/stack.h"

#include "types/raw_address.h"



TestStack test_stack_;



bluetooth::shim::IStack* bluetooth::shim::GetGabeldorscheStack() {

  return (bluetooth::shim::IStack*)&test_stack_;

}



namespace bluetooth {

namespace legacy {

system/main/shim/stub/Android.bp

0 → 100644
+25 −0
Original line number Diff line number Diff line 
filegroup {

    name: "LibBluetoothShimStubSources",

    srcs: [

        "common.cc",

        "osi.cc",

        "stack.cc",

    ]

}



cc_library_static {

    name: "libbluetooth-gd-stub",

    defaults: ["fluoride_defaults"],



    srcs: [

        "null_stack.cc",

    ],

    host_supported: true,

    include_dirs: [

        "packages/modules/Bluetooth/system",

    ],

    cflags: [

        "-dbuildcfg",

    ],

}