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

Commit 1477848c authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge changes I42c47d98,If38ad50d am: 96141547 

am: 10f5451c

Change-Id: Ie780be4bbd91131163721f33febf01fe08a8904d
parents 0e4a162f 10f5451c

Android.bp

+4 −4
Original line number Diff line number Diff line
@@ -30,6 +30,6 @@ subdirs = [ 
filegroup {

    name: "BluetoothTestConfigTemplate",

    srcs: [

    "AndroidTestTemplate.xml"

  ]

        "AndroidTestTemplate.xml",

    ],

}

proto/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -16,4 +16,3 @@ cc_library_static { 
    },

    srcs: ["bluetooth/metrics/bluetooth.proto"],

}

system/audio_a2dp_hw/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ cc_defaults { 
        "packages/modules/Bluetooth/system",

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

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

    ]

    ],

}



// Audio A2DP shared library for target

system/audio_hearing_aid_hw/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ cc_defaults { 
        "packages/modules/Bluetooth/system",

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

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

    ]

    ],

}



// Audio A2DP shared library for target

system/btif/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ cc_test { 
    include_dirs: btifCommonIncludes,

    srcs: [

        "src/btif_profile_queue.cc",

      "test/btif_profile_queue_test.cc"

        "test/btif_profile_queue_test.cc",

    ],

    header_libs: ["libbluetooth_headers"],

    shared_libs: [