| commit | 4eb3c74a4af627363e356eec8c615ea5c4815063 | [log] [tgz] |
|---|---|---|
| author | Marie Janssen <jamuraa@google.com> | Tue Apr 11 19:16:01 2023 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Apr 11 19:16:01 2023 +0000 |
| tree | 82cb731fc1d4a0b366fe3833b01038924cd4145c | |
| parent | 490f16c19b82c54726861aa523add5e8d7b55fce [diff] | |
| parent | 4f300b4811c2dfda4741158f3844484a3386e13e [diff] |
Merge "[third_party][sbc] Fix build" into main
diff --git a/system/embdrv/sbc/decoder/srce/dequant.c b/system/embdrv/sbc/decoder/srce/dequant.c index e2bce9e..cd592f3 100644 --- a/system/embdrv/sbc/decoder/srce/dequant.c +++ b/system/embdrv/sbc/decoder/srce/dequant.c
@@ -117,8 +117,8 @@ #define SBC_DEQUANT_SCALING_FACTOR 1.38019122262781f #endif -const uint32_t dequant_long_scaled[17]; -const uint32_t dequant_long_unscaled[17]; +extern const uint32_t dequant_long_scaled[17]; +extern const uint32_t dequant_long_unscaled[17]; /** Scales x by y bits to the right, adding a rounding factor. */
diff --git a/system/embdrv/sbc/encoder/include/sbc_encoder.h b/system/embdrv/sbc/encoder/include/sbc_encoder.h index 3a8554f..e8c9036 100644 --- a/system/embdrv/sbc/encoder/include/sbc_encoder.h +++ b/system/embdrv/sbc/encoder/include/sbc_encoder.h
@@ -30,8 +30,6 @@ #include <stdbool.h> #include <string.h> -#include "bt_target.h" - /*DEFINES*/ #ifndef FALSE #define FALSE 0
diff --git a/system/embdrv/sbc/encoder/include/sbc_types.h b/system/embdrv/sbc/encoder/include/sbc_types.h index 1877d03..0aece6f 100644 --- a/system/embdrv/sbc/encoder/include/sbc_types.h +++ b/system/embdrv/sbc/encoder/include/sbc_types.h
@@ -27,8 +27,6 @@ #include <stdint.h> -#include "bt_target.h" - #define abs32(x) (((x) >= 0) ? (x) : (-(x))) #endif
diff --git a/system/embdrv/sbc/encoder/srce/sbc_encoder.c b/system/embdrv/sbc/encoder/srce/sbc_encoder.c index 54212ad..35f5413 100644 --- a/system/embdrv/sbc/encoder/srce/sbc_encoder.c +++ b/system/embdrv/sbc/encoder/srce/sbc_encoder.c
@@ -24,7 +24,6 @@ #include "sbc_encoder.h" #include <string.h> -#include "bt_target.h" #include "sbc_enc_func_declare.h" int16_t EncMaxShiftCounter;