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

Commit 0fb14cd7 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

mock: Extract main::shim mocks::dumpsys am: 5e321a75 am: bbe63cc9 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2967660



Change-Id: I5062ee3a7afdcb20262dbebf8517178045c1d34e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 40bebfd2 bbe63cc9

system/btif/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -613,6 +613,7 @@ cc_test { 
        ":TestMockBtu",

        ":TestMockHci",

        ":TestMockMainShim",

        ":TestMockMainShimDumpsys",

        ":TestMockMainShimEntry",

        ":TestMockStack",

        ":TestMockUdrv",
@@ -738,6 +739,7 @@ cc_test { 
        ":TestMockBtu",

        ":TestMockHci",

        ":TestMockMainShim",

        ":TestMockMainShimDumpsys",

        ":TestMockMainShimEntry",

        ":TestMockStack",

        ":TestMockUdrv",

system/gd/dumpsys/bundler/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ genrule { 
        "//packages/modules/Bluetooth/system/gd",

        "//packages/modules/Bluetooth/system/main",

        "//packages/modules/Bluetooth/system/rust",

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

    ],

    tools: [

        "flatc",

system/stack/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -845,6 +845,7 @@ cc_test { 
cc_test {

    name: "net_test_stack_smp",

    defaults: [

        "bluetooth_flatbuffer_bundler_defaults",

        "fluoride_defaults",

        "mts_defaults",

    ],
@@ -1502,6 +1503,7 @@ cc_test { 
        unit_test: true,

    },

    defaults: [

        "bluetooth_flatbuffer_bundler_defaults",

        "fluoride_defaults",

        "mts_defaults",

    ],
@@ -2018,6 +2020,7 @@ cc_test { 
    test_suites: ["general-tests"],

    host_supported: true,

    defaults: [

        "bluetooth_flatbuffer_bundler_defaults",

        "fluoride_defaults",

        "mts_defaults",

    ],

system/test/Android.bp

+7 −1
Original line number Diff line number Diff line
@@ -187,6 +187,13 @@ filegroup { 
    ],

}



filegroup {

    name: "TestMockMainShimDumpsys",

    srcs: [

        "mock/mock_main_shim_dumpsys.cc",

    ],

}



filegroup {

    name: "TestMockMainShim",

    srcs: [
@@ -198,7 +205,6 @@ filegroup { 
        "mock/mock_main_shim_btm_api.cc",

        "mock/mock_main_shim_controller.cc",

        "mock/mock_main_shim_distance_measurement_manager.cc",

        "mock/mock_main_shim_dumpsys.cc",

        "mock/mock_main_shim_hci_layer.cc",

        "mock/mock_main_shim_l2cap_api.cc",

        "mock/mock_main_shim_le_advertising_manager.cc",

system/test/mock/mock_main_shim_dumpsys.cc

+3 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
 */



#include "main/shim/dumpsys.h"

#include "shim/dumpsys.h"

#include "test/common/mock_functions.h"



void bluetooth::shim::RegisterDumpsysFunction(const void* /* token */,
@@ -32,3 +33,5 @@ void bluetooth::shim::Dump(int /* fd */, const char** /* args */) { 
void bluetooth::shim::UnregisterDumpsysFunction(const void* /* token */) {

  inc_func_call_count(__func__);

}



void bluetooth::shim::Dumpsys::Dump(int /* fd */, const char** /* args */) {}