From 861bebbfd29ab2c8d5cd59bdbed940ec75fed111 Mon Sep 17 00:00:00 2001 From: Vaisakh Murali Date: Sat, 12 Nov 2022 14:11:30 +0000 Subject: [PATCH] rosemary: Build libbluetooth_audio_session from source The older VNDK 30 blob when linked against the newer default bluetooth HW module, had a missing symbol: `_ZN7android9bluetooth5audio25BluetoothAudioSession_2_132invalidOffloadAudioConfigurationE` Since we build default bluetooth HW module from source, build libbluetooth_audio_session from source as well. Fixes: Bluetooth Audio on Android 12 Signed-off-by: Vaisakh Murali Change-Id: I13c09ecc37f709c575103d108acf5ca1b5aa2553 --- device.mk | 3 ++- proprietary-files.txt | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/device.mk b/device.mk index 5358207..08a570b 100644 --- a/device.mk +++ b/device.mk @@ -80,7 +80,8 @@ PRODUCT_COPY_FILES += \ # Bluetooth PRODUCT_PACKAGES += \ android.hardware.bluetooth@1.0.vendor \ - android.hardware.bluetooth@1.1.vendor + android.hardware.bluetooth@1.1.vendor \ + libbluetooth_audio_session # Camera PRODUCT_PACKAGES += \ diff --git a/proprietary-files.txt b/proprietary-files.txt index b334ca0..3e0b7d8 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -212,7 +212,6 @@ vendor/bin/autobt vendor/etc/init/android.hardware.bluetooth@1.0-service-mediatek.rc vendor/etc/init/init.bip.rc vendor/lib/hw/android.hardware.bluetooth@1.0-impl-mediatek.so -vendor/lib/libbluetooth_audio_session.so vendor/lib/libbluetooth_audio_session_mediatek.so vendor/lib/libbluetooth_hw_test.so vendor/lib/libbluetooth_mtk.so @@ -221,7 +220,6 @@ vendor/lib/libbluetooth_relayer.so vendor/lib/libbluetoothem_mtk.so vendor/lib/libbt-vendor.so vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-mediatek.so -vendor/lib64/libbluetooth_audio_session.so vendor/lib64/libbluetooth_audio_session_mediatek.so vendor/lib64/libbluetooth_hw_test.so vendor/lib64/libbluetooth_mtk.so