From d0a41af209e80f1fa1d915cc29f3657f88963570 Mon Sep 17 00:00:00 2001
From: Jakub Pawlowski <jpawlowski@google.com>
Date: Mon, 3 Jan 2022 17:53:02 +0100
Subject: [PATCH] Move lc3_enc -> lc3
This folder will contain LC3 decoder too.
Bug: 150670922
Change-Id: I8ea21f44813c1c388e8ee2fd6190331d180b60db
---
system/bta/Android.bp | 2 +-
system/bta/le_audio/client.cc | 2 +-
system/btif/Android.bp | 2 +-
system/embdrv/{lc3_enc => lc3}/Android.bp | 6 +++---
.../embdrv/{lc3_enc => lc3}/fuzzer/liblc3encoder_fuzzer.cpp | 0
system/embdrv/{lc3_enc => lc3}/include/lc3.h | 0
system/embdrv/{lc3_enc => lc3}/include/lc3_private.h | 0
system/embdrv/{lc3_enc => lc3}/src/attdet.c | 0
system/embdrv/{lc3_enc => lc3}/src/attdet.h | 0
system/embdrv/{lc3_enc => lc3}/src/bits.c | 0
system/embdrv/{lc3_enc => lc3}/src/bits.h | 0
system/embdrv/{lc3_enc => lc3}/src/bwdet.c | 0
system/embdrv/{lc3_enc => lc3}/src/bwdet.h | 0
system/embdrv/{lc3_enc => lc3}/src/common.h | 0
system/embdrv/{lc3_enc => lc3}/src/lc3.c | 0
system/embdrv/{lc3_enc => lc3}/src/ltpf.c | 0
system/embdrv/{lc3_enc => lc3}/src/ltpf.h | 0
system/embdrv/{lc3_enc => lc3}/src/mdct.c | 0
system/embdrv/{lc3_enc => lc3}/src/mdct.h | 0
system/embdrv/{lc3_enc => lc3}/src/noise.c | 0
system/embdrv/{lc3_enc => lc3}/src/noise.h | 0
system/embdrv/{lc3_enc => lc3}/src/quant.c | 0
system/embdrv/{lc3_enc => lc3}/src/quant.h | 0
system/embdrv/{lc3_enc => lc3}/src/sns.c | 0
system/embdrv/{lc3_enc => lc3}/src/sns.h | 0
system/embdrv/{lc3_enc => lc3}/src/tables.c | 0
system/embdrv/{lc3_enc => lc3}/src/tables.h | 0
system/embdrv/{lc3_enc => lc3}/src/tns.c | 0
system/embdrv/{lc3_enc => lc3}/src/tns.h | 0
system/gd/rust/topshim/facade/Android.bp | 2 +-
system/main/Android.bp | 2 +-
system/stack/Android.bp | 2 +-
system/stack/test/fuzzers/Android.bp | 2 +-
system/test/headless/Android.bp | 2 +-
34 files changed, 11 insertions(+), 11 deletions(-)
rename system/embdrv/{lc3_enc => lc3}/Android.bp (93%)
rename system/embdrv/{lc3_enc => lc3}/fuzzer/liblc3encoder_fuzzer.cpp (100%)
rename system/embdrv/{lc3_enc => lc3}/include/lc3.h (100%)
rename system/embdrv/{lc3_enc => lc3}/include/lc3_private.h (100%)
rename system/embdrv/{lc3_enc => lc3}/src/attdet.c (100%)
rename system/embdrv/{lc3_enc => lc3}/src/attdet.h (100%)
rename system/embdrv/{lc3_enc => lc3}/src/bits.c (100%)
rename system/embdrv/{lc3_enc => lc3}/src/bits.h (100%)
rename system/embdrv/{lc3_enc => lc3}/src/bwdet.c (100%)
rename system/embdrv/{lc3_enc => lc3}/src/bwdet.h (100%)
rename system/embdrv/{lc3_enc => lc3}/src/common.h (100%)
rename system/embdrv/{lc3_enc => lc3}/src/lc3.c (100%)
rename system/embdrv/{lc3_enc => lc3}/src/ltpf.c (100%)
rename system/embdrv/{lc3_enc => lc3}/src/ltpf.h (100%)
rename system/embdrv/{lc3_enc => lc3}/src/mdct.c (100%)
rename system/embdrv/{lc3_enc => lc3}/src/mdct.h (100%)
rename system/embdrv/{lc3_enc => lc3}/src/noise.c (100%)
rename system/embdrv/{lc3_enc => lc3}/src/noise.h (100%)
rename system/embdrv/{lc3_enc => lc3}/src/quant.c (100%)
rename system/embdrv/{lc3_enc => lc3}/src/quant.h (100%)
rename system/embdrv/{lc3_enc => lc3}/src/sns.c (100%)
rename system/embdrv/{lc3_enc => lc3}/src/sns.h (100%)
rename system/embdrv/{lc3_enc => lc3}/src/tables.c (100%)
rename system/embdrv/{lc3_enc => lc3}/src/tables.h (100%)
rename system/embdrv/{lc3_enc => lc3}/src/tns.c (100%)
rename system/embdrv/{lc3_enc => lc3}/src/tns.h (100%)
diff --git a/system/bta/Android.bp b/system/bta/Android.bp
index ef11ef6976d..2ced5fed34b 100644
--- a/system/bta/Android.bp
+++ b/system/bta/Android.bp
@@ -516,7 +516,7 @@ cc_test {
"libbt-protos-lite",
"libosi",
"liblc3codec",
- "liblc3encoder",
+ "liblc3",
],
sanitize: {
cfi: true,
diff --git a/system/bta/le_audio/client.cc b/system/bta/le_audio/client.cc
index 259e9337e5c..1e5bb9975f1 100644
--- a/system/bta/le_audio/client.cc
+++ b/system/bta/le_audio/client.cc
@@ -34,7 +34,7 @@
#include "device/include/controller.h"
#include "devices.h"
#include "embdrv/lc3_dec/Api/Lc3Decoder.hpp"
-#include "embdrv/lc3_enc/include/lc3.h"
+#include "embdrv/lc3/include/lc3.h"
#include "gatt/bta_gattc_int.h"
#include "le_audio_types.h"
#include "osi/include/osi.h"
diff --git a/system/btif/Android.bp b/system/btif/Android.bp
index 4537ccdb91e..f3c13b5e7fd 100644
--- a/system/btif/Android.bp
+++ b/system/btif/Android.bp
@@ -244,7 +244,7 @@ cc_test {
"libFraunhoferAAC",
"libg722codec",
"liblc3codec",
- "liblc3encoder",
+ "liblc3",
"libbtdevice",
"libbt-hci",
"libudrv-uipc",
diff --git a/system/embdrv/lc3_enc/Android.bp b/system/embdrv/lc3/Android.bp
similarity index 93%
rename from system/embdrv/lc3_enc/Android.bp
rename to system/embdrv/lc3/Android.bp
index 48735febf99..7b6e137f01e 100644
--- a/system/embdrv/lc3_enc/Android.bp
+++ b/system/embdrv/lc3/Android.bp
@@ -8,7 +8,7 @@ package {
}
cc_library_static {
- name: "liblc3encoder",
+ name: "liblc3",
host_supported: true,
apex_available: [
@@ -48,13 +48,13 @@ cc_library_static {
}
cc_fuzz {
- name: "liblc3encoder_fuzzer",
+ name: "liblc3_fuzzer",
srcs: [
"fuzzer/liblc3encoder_fuzzer.cpp",
],
static_libs: [
- "liblc3encoder",
+ "liblc3",
],
}
diff --git a/system/embdrv/lc3_enc/fuzzer/liblc3encoder_fuzzer.cpp b/system/embdrv/lc3/fuzzer/liblc3encoder_fuzzer.cpp
similarity index 100%
rename from system/embdrv/lc3_enc/fuzzer/liblc3encoder_fuzzer.cpp
rename to system/embdrv/lc3/fuzzer/liblc3encoder_fuzzer.cpp
diff --git a/system/embdrv/lc3_enc/include/lc3.h b/system/embdrv/lc3/include/lc3.h
similarity index 100%
rename from system/embdrv/lc3_enc/include/lc3.h
rename to system/embdrv/lc3/include/lc3.h
diff --git a/system/embdrv/lc3_enc/include/lc3_private.h b/system/embdrv/lc3/include/lc3_private.h
similarity index 100%
rename from system/embdrv/lc3_enc/include/lc3_private.h
rename to system/embdrv/lc3/include/lc3_private.h
diff --git a/system/embdrv/lc3_enc/src/attdet.c b/system/embdrv/lc3/src/attdet.c
similarity index 100%
rename from system/embdrv/lc3_enc/src/attdet.c
rename to system/embdrv/lc3/src/attdet.c
diff --git a/system/embdrv/lc3_enc/src/attdet.h b/system/embdrv/lc3/src/attdet.h
similarity index 100%
rename from system/embdrv/lc3_enc/src/attdet.h
rename to system/embdrv/lc3/src/attdet.h
diff --git a/system/embdrv/lc3_enc/src/bits.c b/system/embdrv/lc3/src/bits.c
similarity index 100%
rename from system/embdrv/lc3_enc/src/bits.c
rename to system/embdrv/lc3/src/bits.c
diff --git a/system/embdrv/lc3_enc/src/bits.h b/system/embdrv/lc3/src/bits.h
similarity index 100%
rename from system/embdrv/lc3_enc/src/bits.h
rename to system/embdrv/lc3/src/bits.h
diff --git a/system/embdrv/lc3_enc/src/bwdet.c b/system/embdrv/lc3/src/bwdet.c
similarity index 100%
rename from system/embdrv/lc3_enc/src/bwdet.c
rename to system/embdrv/lc3/src/bwdet.c
diff --git a/system/embdrv/lc3_enc/src/bwdet.h b/system/embdrv/lc3/src/bwdet.h
similarity index 100%
rename from system/embdrv/lc3_enc/src/bwdet.h
rename to system/embdrv/lc3/src/bwdet.h
diff --git a/system/embdrv/lc3_enc/src/common.h b/system/embdrv/lc3/src/common.h
similarity index 100%
rename from system/embdrv/lc3_enc/src/common.h
rename to system/embdrv/lc3/src/common.h
diff --git a/system/embdrv/lc3_enc/src/lc3.c b/system/embdrv/lc3/src/lc3.c
similarity index 100%
rename from system/embdrv/lc3_enc/src/lc3.c
rename to system/embdrv/lc3/src/lc3.c
diff --git a/system/embdrv/lc3_enc/src/ltpf.c b/system/embdrv/lc3/src/ltpf.c
similarity index 100%
rename from system/embdrv/lc3_enc/src/ltpf.c
rename to system/embdrv/lc3/src/ltpf.c
diff --git a/system/embdrv/lc3_enc/src/ltpf.h b/system/embdrv/lc3/src/ltpf.h
similarity index 100%
rename from system/embdrv/lc3_enc/src/ltpf.h
rename to system/embdrv/lc3/src/ltpf.h
diff --git a/system/embdrv/lc3_enc/src/mdct.c b/system/embdrv/lc3/src/mdct.c
similarity index 100%
rename from system/embdrv/lc3_enc/src/mdct.c
rename to system/embdrv/lc3/src/mdct.c
diff --git a/system/embdrv/lc3_enc/src/mdct.h b/system/embdrv/lc3/src/mdct.h
similarity index 100%
rename from system/embdrv/lc3_enc/src/mdct.h
rename to system/embdrv/lc3/src/mdct.h
diff --git a/system/embdrv/lc3_enc/src/noise.c b/system/embdrv/lc3/src/noise.c
similarity index 100%
rename from system/embdrv/lc3_enc/src/noise.c
rename to system/embdrv/lc3/src/noise.c
diff --git a/system/embdrv/lc3_enc/src/noise.h b/system/embdrv/lc3/src/noise.h
similarity index 100%
rename from system/embdrv/lc3_enc/src/noise.h
rename to system/embdrv/lc3/src/noise.h
diff --git a/system/embdrv/lc3_enc/src/quant.c b/system/embdrv/lc3/src/quant.c
similarity index 100%
rename from system/embdrv/lc3_enc/src/quant.c
rename to system/embdrv/lc3/src/quant.c
diff --git a/system/embdrv/lc3_enc/src/quant.h b/system/embdrv/lc3/src/quant.h
similarity index 100%
rename from system/embdrv/lc3_enc/src/quant.h
rename to system/embdrv/lc3/src/quant.h
diff --git a/system/embdrv/lc3_enc/src/sns.c b/system/embdrv/lc3/src/sns.c
similarity index 100%
rename from system/embdrv/lc3_enc/src/sns.c
rename to system/embdrv/lc3/src/sns.c
diff --git a/system/embdrv/lc3_enc/src/sns.h b/system/embdrv/lc3/src/sns.h
similarity index 100%
rename from system/embdrv/lc3_enc/src/sns.h
rename to system/embdrv/lc3/src/sns.h
diff --git a/system/embdrv/lc3_enc/src/tables.c b/system/embdrv/lc3/src/tables.c
similarity index 100%
rename from system/embdrv/lc3_enc/src/tables.c
rename to system/embdrv/lc3/src/tables.c
diff --git a/system/embdrv/lc3_enc/src/tables.h b/system/embdrv/lc3/src/tables.h
similarity index 100%
rename from system/embdrv/lc3_enc/src/tables.h
rename to system/embdrv/lc3/src/tables.h
diff --git a/system/embdrv/lc3_enc/src/tns.c b/system/embdrv/lc3/src/tns.c
similarity index 100%
rename from system/embdrv/lc3_enc/src/tns.c
rename to system/embdrv/lc3/src/tns.c
diff --git a/system/embdrv/lc3_enc/src/tns.h b/system/embdrv/lc3/src/tns.h
similarity index 100%
rename from system/embdrv/lc3_enc/src/tns.h
rename to system/embdrv/lc3/src/tns.h
diff --git a/system/gd/rust/topshim/facade/Android.bp b/system/gd/rust/topshim/facade/Android.bp
index 18e56a459e3..be61d34a4a5 100644
--- a/system/gd/rust/topshim/facade/Android.bp
+++ b/system/gd/rust/topshim/facade/Android.bp
@@ -46,7 +46,7 @@ rust_binary_host {
"libFraunhoferAAC",
"libg722codec",
"liblc3codec",
- "liblc3encoder",
+ "liblc3",
"libudrv-uipc",
"libbluetooth_gd", // Gabeldorsche
"libbluetooth-dumpsys",
diff --git a/system/main/Android.bp b/system/main/Android.bp
index 3073c4b034d..7d3c50e2e2a 100644
--- a/system/main/Android.bp
+++ b/system/main/Android.bp
@@ -104,7 +104,7 @@ cc_library_shared {
"libFraunhoferAAC",
"libg722codec",
"liblc3codec",
- "liblc3encoder",
+ "liblc3",
"libudrv-uipc",
"libprotobuf-cpp-lite",
"libbluetooth_gd", // Gabeldorsche
diff --git a/system/stack/Android.bp b/system/stack/Android.bp
index 278fdb4507e..a4f242b66f7 100644
--- a/system/stack/Android.bp
+++ b/system/stack/Android.bp
@@ -272,7 +272,7 @@ cc_test {
"libbtdevice",
"libg722codec",
"liblc3codec",
- "liblc3encoder",
+ "liblc3",
"libosi",
"libudrv-uipc",
"libbt-protos-lite",
diff --git a/system/stack/test/fuzzers/Android.bp b/system/stack/test/fuzzers/Android.bp
index 65f08aa5131..d9010752ebc 100644
--- a/system/stack/test/fuzzers/Android.bp
+++ b/system/stack/test/fuzzers/Android.bp
@@ -35,7 +35,7 @@ cc_defaults {
"libbtdevice",
"libg722codec",
"liblc3codec",
- "liblc3encoder",
+ "liblc3",
"libosi",
"libudrv-uipc",
"libbt-protos-lite",
diff --git a/system/test/headless/Android.bp b/system/test/headless/Android.bp
index 9cc84574571..820cdc538c1 100644
--- a/system/test/headless/Android.bp
+++ b/system/test/headless/Android.bp
@@ -50,7 +50,7 @@ cc_test {
"libflatbuffers-cpp",
"libg722codec",
"liblc3codec",
- "liblc3encoder",
+ "liblc3",
"libosi",
"libprotobuf-cpp-lite",
"libudrv-uipc",
--
GitLab