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

Commit 8557c7f7 authored by Jeremy Wu's avatar Jeremy Wu Committed by Automerger Merge Worker
Browse files

Merge "Floss: use external/lc3" into main am: 0e4c41c9 am: a6a41359 

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



Change-Id: Iab78cc67d5be1b8a6956b8c18c19819fb8b7bbc4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f7592e16 a6a41359

system/stack/mmc/codec_server/BUILD.gn

+4 −1
Original line number Diff line number Diff line
@@ -22,9 +22,12 @@ source_set("libcodec_server_hfp_lc3"){ 
    "//bt/system/stack",

    "//bt/system/stack/include",

  ]

  libs = [

    "lc3",

  ]



  deps = [

    "//bt/system/stack/mmc/proto:mmc_config_proto",

    "//bt/system/embdrv/lc3:liblc3",

    "//bt/system/osi",

  ]

  sources = [

system/stack/mmc/codec_server/hfp_lc3_mmc_decoder.cc

+1 −1
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 


#include <base/logging.h>

#include <errno.h>

#include <lc3.h>



#include "embdrv/lc3/include/lc3.h"

#include "mmc/codec_server/lc3_utils.h"

#include "mmc/proto/mmc_config.pb.h"

#include "osi/include/allocator.h"

system/stack/mmc/codec_server/hfp_lc3_mmc_decoder.h

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ 
#ifndef MMC_CODEC_SERVER_HFP_LC3_MMC_DECODER_H_

#define MMC_CODEC_SERVER_HFP_LC3_MMC_DECODER_H_



#include "embdrv/lc3/include/lc3.h"

#include <lc3.h>



#include "mmc/mmc_interface/mmc_interface.h"

#include "mmc/proto/mmc_config.pb.h"

system/stack/mmc/codec_server/hfp_lc3_mmc_encoder.cc

+1 −1
Original line number Diff line number Diff line
@@ -18,10 +18,10 @@ 


#include <base/logging.h>

#include <errno.h>

#include <lc3.h>



#include <algorithm>



#include "embdrv/lc3/include/lc3.h"

#include "mmc/codec_server/lc3_utils.h"

#include "mmc/proto/mmc_config.pb.h"

#include "osi/include/allocator.h"

system/stack/mmc/codec_server/hfp_lc3_mmc_encoder.h

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ 
#ifndef MMC_CODEC_SERVER_HFP_LC3_MMC_ENCODER_H_

#define MMC_CODEC_SERVER_HFP_LC3_MMC_ENCODER_H_



#include "embdrv/lc3/include/lc3.h"

#include <lc3.h>



#include "mmc/mmc_interface/mmc_interface.h"

#include "mmc/proto/mmc_config.pb.h"