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

Commit b8cc944c authored by David Duarte's avatar David Duarte Committed by Automerger Merge Worker
Browse files

Merge "Use external/liblc3" into main am: 653747af 

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



Change-Id: Ifdd43e9b885af12c7e434932837adf147c456fa0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e6863107 653747af

floss/build/Dockerfile

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ RUN apt-get update && \ 
    libglib2.0-dev \

    libgtest-dev \

    libgmock-dev \

    liblc3-dev \

    liblz4-tool \

    libncurses5 \

    libnss3-dev \

system/bta/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ cc_library_static { 
        "libbt-platform-protos-lite",

        "libbt_shim_bridge",

        "libcom.android.sysprop.bluetooth",

        "liblc3",

    ],

    shared_libs: [

        "android.hardware.bluetooth.audio@2.1",
@@ -914,6 +915,7 @@ cc_test { 
        "libevent",

        "libflatbuffers-cpp",

        "libgmock",

        "liblc3",

        "libosi",

    ],

    data: [
@@ -1034,6 +1036,7 @@ cc_test { 
        "libbt_shim_ffi",

        "libchrome",

        "libgmock",

        "liblc3",

    ],

    sanitize: {

        cfi: true,
@@ -1101,6 +1104,7 @@ cc_test { 
        "libchrome",

        "libevent",

        "libgmock",

        "liblc3",

        "libosi",

    ],

    sanitize: {

system/bta/le_audio/broadcaster/broadcaster.cc

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
 */



#include <base/functional/bind.h>

#include <lc3.h>



#include <mutex>

system/bta/le_audio/broadcaster/broadcaster_types.cc

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 


#include "broadcaster_types.h"



#include <lc3.h>



#include <vector>



#include "bt_types.h"

system/bta/le_audio/client.cc

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 


#include <base/functional/bind.h>

#include <base/strings/string_number_conversions.h>

#include <lc3.h>



#include <deque>

#include <mutex>