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

Commit 54d92117 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Merge "build: Remove default Bluetooth/system/btcore/include" am: 9d249d6b... 

Merge "build: Remove default Bluetooth/system/btcore/include" am: 9d249d6b am: e5fdb453 am: 9daeecc2 am: d92ce9a1

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

Change-Id: Icc6b2bd4b8ba4eeb46cb40b1b5f5afd530dab96e
parents 995c8801 d92ce9a1

system/bta/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ cc_defaults { 
    include_dirs: [

        "packages/modules/Bluetooth/system",

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

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

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

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

        "packages/modules/Bluetooth/system/gd",
@@ -618,7 +617,6 @@ cc_test { 
        "packages/modules/Bluetooth/system/bta/include",

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

        "packages/modules/Bluetooth/system/bta/test/common",

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

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

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

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

system/bta/BUILD.gn

+0 −2
Original line number Diff line number Diff line
@@ -106,7 +106,6 @@ static_library("bta") { 
    "//bt/system/linux_include",

    "//bt/system/bta",

    "//bt/system/internal_include",

    "//bt/system/btcore/include",

    "//bt/system/hci/include",

    "//bt/system/internal_include",

    "//bt/system/stack/include",
@@ -147,7 +146,6 @@ if (use.test) { 
      "include",

      "//bt/system/",

      "//bt/system/bta",

      "//bt/system/btcore/include",

      "//bt/system/hci/include",

      "//bt/system/internal_include",

      "//bt/system/stack/btm",

system/btif/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ btifCommonIncludes = [ 
    "packages/modules/Bluetooth/system/bta/dm",

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

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

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

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

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

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

system/btif/BUILD.gn

+0 −1
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ static_library("btif") { 
    "//bt/system/audio_hearing_aid_hw/include",

    "//bt/system/bta/include",

    "//bt/system/bta/sys",

    "//bt/system/btcore/include",

    "//bt/system/device/include",

    "//bt/system/embdrv/sbc/encoder/include",

    "//bt/system/embdrv/sbc/decoder/include",

system/device/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ cc_library_static { 
    include_dirs: [

        "packages/modules/Bluetooth/system",

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

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

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

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

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