From 365e76c21135d25126ba2757eb3aa7e3826b8ac3 Mon Sep 17 00:00:00 2001 From: William Escande Date: Thu, 28 Apr 2022 11:53:12 -0700 Subject: Statically link ldac into module If we statically link ldac, we enforce at build time the "api" are still the same. We also enforce the current module version was tested against a known ldac encoder and we do not have to deal with version mismatched Bug: 226572369 Test: Build + boot + Not yet tested Tag: #refactor Ignore-AOSP-First: Apex only on TM Merged-In: Ib0223f833e3842240bb801013f99963b6c44b48a Change-Id: Ib0223f833e3842240bb801013f99963b6c44b48a --- Android.bp | 29 +++++++++++++++++++++++++---- METADATA | 6 ++++++ 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/Android.bp b/Android.bp index 7f8e448..69f35a1 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,26 @@ 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/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 +69,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 } -- cgit v1.2.3