summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2022-08-15 22:02:41 -0700
committerXin Li <delphij@google.com>2022-08-15 22:02:41 -0700
commit0b42fd758603568a0eabf698b68f637c167bf30a (patch)
tree5f40f18577f10a76929934c98769f5dd8a4d8613
parent85f32ceaa1bfedd1a189d44ee12e1903ffaeda0f (diff)
parent4b70778e8b7261ed2dc2989756600926bac393e8 (diff)
downloadlibldac-0b42fd758603568a0eabf698b68f637c167bf30a.tar.gz
DO NOT MERGE - Merge Android 13
Bug: 242648940 Merged-In: Ib0223f833e3842240bb801013f99963b6c44b48a Change-Id: Ie84bf940de206539edd3f66ae3648038c9b188cc
-rw-r--r--Android.bp30
-rw-r--r--METADATA6
-rw-r--r--fuzzer/Android.bp2
3 files changed, 33 insertions, 5 deletions
diff --git a/Android.bp b/Android.bp
index 7f8e448..03a4b24 100644
--- a/Android.bp
+++ b/Android.bp
@@ -21,13 +21,14 @@ license {
],
}
-cc_library_shared {
+cc_library {
name: "libldacBT_enc",
vendor_available: true,
product_available: true,
vndk: {
enabled: true,
},
+ host_supported: true,
arch: {
arm: {
instruction_set: "arm",
@@ -41,15 +42,27 @@ cc_library_shared {
// -D_32BIT_FIXED_POINT should be added to cflags for devices without a FPU
// unit such as ARM Cortex-R series or external 32-bit DSPs.
cflags: ["-O2", "-Werror", "-Wall", "-Wextra"],
+ min_sdk_version: "Tiramisu",
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.bluetooth",
+ ],
+ visibility: [
+ "//external/libldac/fuzzer",
+ "//external/oss-fuzz",
+ "//packages/modules/Bluetooth:__subpackages__",
+ "//packages/modules/vndk/apex",
+ ],
}
-cc_library_shared {
+cc_library {
name: "libldacBT_abr",
vendor_available: true,
product_available: true,
vndk: {
enabled: true,
},
+ host_supported: true,
arch: {
arm: {
instruction_set: "arm",
@@ -57,6 +70,15 @@ cc_library_shared {
},
export_include_dirs: ["abr/inc"],
srcs: ["abr/src/ldacBT_abr.c"],
- shared_libs: ["libldacBT_enc"],
- cflags: ["-O2", "-Werror", "-Wall", "-Wextra"]
+ static_libs: ["libldacBT_enc"],
+ cflags: ["-O2", "-Werror", "-Wall", "-Wextra"],
+ min_sdk_version: "Tiramisu",
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.bluetooth",
+ ],
+ visibility: [
+ "//packages/modules/Bluetooth:__subpackages__",
+ "//packages/modules/vndk/apex",
+ ],
}
diff --git a/METADATA b/METADATA
index d97975c..4309424 100644
--- a/METADATA
+++ b/METADATA
@@ -1,3 +1,9 @@
+name: "ldac"
+description: "LDAC is a bluetooth codec of Hi-Res Audio Wireless. AOSP is the upstream version"
third_party {
+ url {
+ type: HOMEPAGE
+ value: "https://www.sony.net/Products/LDAC/"
+ }
license_type: NOTICE
}
diff --git a/fuzzer/Android.bp b/fuzzer/Android.bp
index 1d2620f..01f586d 100644
--- a/fuzzer/Android.bp
+++ b/fuzzer/Android.bp
@@ -18,7 +18,7 @@ package {
cc_fuzz {
name: "libldac-encode_fuzzer",
- shared_libs: ["libldacBT_enc"],
+ static_libs: ["libldacBT_enc"],
srcs: ["libldac_encode_fuzzer.cc"],
fuzz_config: {
componentid: 27441