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

Commit ac0fa5a4 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by Automerger Merge Worker
Browse files

Merge changes from topic "csis_internal" into stage-aosp-master am: 113d78fb am: c74f8f0b

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/15795711

Change-Id: I8581167dcf01e7a2ee55bc37fdb36d5eac21a315
parents b7a7260b c74f8f0b
Loading
Loading
Loading
Loading
+52 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ cc_library_static {
        "av/bta_av_ci.cc",
        "av/bta_av_main.cc",
        "av/bta_av_ssm.cc",
        "csis/csis_client.cc",
        "gatt/bta_gattc_act.cc",
        "gatt/bta_gattc_api.cc",
        "gatt/bta_gattc_cache.cc",
@@ -258,6 +259,57 @@ cc_test {
    cflags: ["-DBUILDCFG"],
}

// csis unit tests for host
cc_test {
    name: "bluetooth_csis_test",
    test_suites: ["device-tests"],
    defaults: [
        "fluoride_bta_defaults",
        "clang_coverage_bin",
    ],
    host_supported: true,
    include_dirs: [
        "packages/modules/Bluetooth/system",
        "packages/modules/Bluetooth/system/bta/groups",
        "packages/modules/Bluetooth/system/bta/include",
        "packages/modules/Bluetooth/system/bta/test/common",
        "packages/modules/Bluetooth/system/btif/include",
        "packages/modules/Bluetooth/system/osi/include",
    ],
    srcs : [
        ":TestMockBtif",
        "csis/csis_client.cc",
        "csis/csis_client_test.cc",
        "groups/groups.cc",
        "gatt/database.cc",
        "gatt/database_builder.cc",
        "test/common/bta_dm_api_mock.cc",
        "test/common/bta_gatt_api_mock.cc",
        "test/common/bta_gatt_queue_mock.cc",
        "test/common/btm_api_mock.cc",
    ],
    shared_libs: [
        "libprotobuf-cpp-lite",
        "libcrypto",
    ],
    static_libs : [
        "crypto_toolbox_for_tests",
        "libgmock",
        "libbt-common",
        "libbt-protos-lite",
        "libosi",
    ],
    sanitize: {
        cfi: true,
        scs: true,
        address: true,
        all_undefined: true,
        integer_overflow: true,
        diag: {
            undefined : true
        },
    },
}

// groups unit tests for host
cc_test {
+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ static_library("bta") {
    "av/bta_av_ci.cc",
    "av/bta_av_main.cc",
    "av/bta_av_ssm.cc",
    "csis/csis_client.cc",
    "dm/bta_dm_act.cc",
    "dm/bta_dm_api.cc",
    "dm/bta_dm_cfg.cc",
Loading