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

Commit 89d7e1d6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes Ib19e9549,Ib5ee07e1 

* changes:
  Promote gd/ to first class include directory
  Sort properly btif/Android::btifCommonIncludes
parents 3b6184f2 131f21cf

system/audio_a2dp_hw/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ cc_defaults { 
    defaults: ["fluoride_defaults"],

    include_dirs: [

        "packages/modules/Bluetooth/system",

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

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

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

    ],

system/audio_hal_interface/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ cc_library_static { 
    defaults: ["fluoride_defaults"],

    include_dirs: [

        "packages/modules/Bluetooth/system",

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

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

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

        "packages/modules/Bluetooth/system/btif/include",
@@ -60,6 +61,7 @@ cc_test { 
    defaults: ["fluoride_defaults"],

    include_dirs: [

        "packages/modules/Bluetooth/system",

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

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

    ],

    srcs: [

system/audio_hearing_aid_hw/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ cc_defaults { 
    defaults: ["fluoride_defaults"],

    include_dirs: [

        "packages/modules/Bluetooth/system",

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

    ],

}

system/bta/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ cc_defaults { 
        "packages/modules/Bluetooth/system/btcore/include",

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

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

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

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

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

        "packages/modules/Bluetooth/system/stack/include",
@@ -218,6 +219,7 @@ cc_test { 
    test_suites: ["device-tests"],

    include_dirs: [

        "packages/modules/Bluetooth/system",

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

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

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

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

system/btcore/Android.bp

+4 −1
Original line number Diff line number Diff line
@@ -12,7 +12,10 @@ cc_library_static { 
    name: "libbtcore",

    defaults: ["fluoride_defaults"],

    local_include_dirs: ["include"],

    include_dirs: ["packages/modules/Bluetooth/system"],

    include_dirs: [

        "packages/modules/Bluetooth/system",

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

    ],

    srcs: [

        "src/device_class.cc",

        "src/hal_util.cc",