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

Commit 7fd173e6 authored by Chris Manton's avatar Chris Manton
Browse files

btif_hh_test: Clean up inclusion dirs 

Bug: 311714808
Test: atest net_test_btif_hh

Change-Id: Ie5f0c0088071c37dc4e2aade186762efbefbfad2
parent 5b373155

system/btif/Android.bp

+4 −61
Original line number Diff line number Diff line
@@ -10,25 +10,12 @@ package { 


btifCommonIncludes = [

    "packages/modules/Bluetooth/system",

    "packages/modules/Bluetooth/system/bta/dm",

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

    "packages/modules/Bluetooth/system/bta/sys",

    "packages/modules/Bluetooth/system/btif/avrcp",

    "packages/modules/Bluetooth/system/btif/co",

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

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

    "packages/modules/Bluetooth/system/embdrv/sbc/decoder/include",

    "packages/modules/Bluetooth/system/embdrv/sbc/encoder/include",

    "packages/modules/Bluetooth/system/gd",

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

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

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

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

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

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

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

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

    "system/libhwbinder/include",

]



cc_library {
@@ -558,30 +545,8 @@ cc_test { 
        "mts_defaults",

    ],

    test_suites: ["general-tests"],

    include_dirs: [

        "frameworks/av/media/libaaudio/include",

        "packages/modules/Bluetooth/system",

        "packages/modules/Bluetooth/system/bta/dm",

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

        "packages/modules/Bluetooth/system/bta/sys",

        "packages/modules/Bluetooth/system/btif/avrcp",

        "packages/modules/Bluetooth/system/btif/co",

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

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

        "packages/modules/Bluetooth/system/embdrv/sbc/decoder/include",

        "packages/modules/Bluetooth/system/embdrv/sbc/encoder/include",

        "packages/modules/Bluetooth/system/gd",

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

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

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

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

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

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

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

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

        "system/libfmq/include",

        "system/libhwbinder/include",

    ],

    include_dirs: btifCommonIncludes +

        ["frameworks/av/media/libaaudio/include"],

    srcs: [

        ":BtaDmSources",

        ":LibBluetoothSources",
@@ -702,30 +667,8 @@ cc_test { 
        "mts_defaults",

    ],

    test_suites: ["general-tests"],

    include_dirs: [

        "frameworks/av/media/libaaudio/include",

        "packages/modules/Bluetooth/system",

        "packages/modules/Bluetooth/system/bta/dm",

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

        "packages/modules/Bluetooth/system/bta/sys",

        "packages/modules/Bluetooth/system/btif/avrcp",

        "packages/modules/Bluetooth/system/btif/co",

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

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

        "packages/modules/Bluetooth/system/embdrv/sbc/decoder/include",

        "packages/modules/Bluetooth/system/embdrv/sbc/encoder/include",

        "packages/modules/Bluetooth/system/gd",

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

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

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

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

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

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

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

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

        "system/libfmq/include",

        "system/libhwbinder/include",

    ],

    include_dirs: btifCommonIncludes +

        ["frameworks/av/media/libaaudio/include"],

    srcs: [

        ":BtaDmSources",

        ":LibBluetoothSources",