diff --git a/Android.bp b/Android.bp index 2505bf8..a70749b 100644 --- a/Android.bp +++ b/Android.bp @@ -2635,12 +2635,12 @@ cc_prebuilt_library_shared { "libcutils", "libfmq", "libhidlbase", - "libhidltransport", "liblog", "libutils", "android.hardware.bluetooth.audio@2.0", "libbluetooth_audio_session", "libbluetooth_audio_session_qti", + "libbluetooth_audio_session_qti_2_1", "libc++", "libc", "libm", @@ -2744,9 +2744,44 @@ cc_prebuilt_library_shared { "libcutils", "libfmq", "libhidlbase", + "liblog", + "libutils", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "32", + relative_install_path: "hw", + prefer: true, + soc_specific: true, +} + +cc_prebuilt_library_shared { + name: "vendor.qti.hardware.bluetooth_audio@2.1-impl", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm: { + srcs: [ + "proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so", + ], + shared_libs: [ + "android.hardware.audio.common@5.0", + "libbluetooth_audio_session_qti_2_1", + "libbase", + "libcutils", + "libfmq", + "libhidlbase", "libhidltransport", "liblog", "libutils", + "vendor.qti.hardware.bluetooth_audio@2.1", + "vendor.qti.hardware.bluetooth_audio@2.0", "libc++", "libc", "libm", @@ -3205,6 +3240,39 @@ cc_prebuilt_library_shared { "proprietary/vendor/lib/libbluetooth_audio_session_qti.so", ], shared_libs: [ + "vendor.qti.hardware.bluetooth_audio@2.0", + "libaudioutils", + "libbase", + "libcutils", + "libfmq", + "libhidlbase", + "liblog", + "libutils", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "32", + prefer: true, + soc_specific: true, +} + +cc_prebuilt_library_shared { + name: "libbluetooth_audio_session_qti_2_1", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm: { + srcs: [ + "proprietary/vendor/lib/libbluetooth_audio_session_qti_2_1.so", + ], + shared_libs: [ + "vendor.qti.hardware.bluetooth_audio@2.1", "vendor.qti.hardware.bluetooth_audio@2.0", "libaudioutils", "libbase", @@ -4945,7 +5013,6 @@ cc_prebuilt_library_shared { "libbase", "libcutils", "libhidlbase", - "libhidltransport", "liblog", "libutils", "libdiag", @@ -4953,6 +5020,7 @@ cc_prebuilt_library_shared { "libqmi_cci", "libbtnv", "android.hardware.bluetooth@1.0", + "libsoc_helper", "libc++", "libc", "libm", @@ -5065,7 +5133,7 @@ cc_prebuilt_library_shared { } cc_prebuilt_library_shared { - name: "vendor.qti.hardware.bluetooth_sar@1.0-impl", + name: "vendor.qti.hardware.bluetooth_sar@1.1-impl", owner: "xiaomi", strip: { none: true, @@ -5073,19 +5141,16 @@ cc_prebuilt_library_shared { target: { android_arm64: { srcs: [ - "proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.0-impl.so", + "proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.1-impl.so", ], shared_libs: [ "libhidlbase", - "libhidltransport", "libutils", "liblog", - "libhwbinder", "libbase", "libcutils", - "libhardware", "vendor.qti.hardware.bluetooth_sar@1.0", - "android.hardware.bluetooth@1.0", + "vendor.qti.hardware.bluetooth_sar@1.1", "android.hardware.bluetooth@1.0-impl-qti", "libc++", "libc", @@ -5115,9 +5180,7 @@ cc_prebuilt_library_shared { "libbase", "libcutils", "libhidlbase", - "libhidltransport", "liblog", - "libhwbinder", "libutils", "vendor.qti.hardware.btconfigstore@1.0", "android.hardware.bluetooth@1.0-impl-qti", @@ -5134,6 +5197,38 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "vendor.qti.hardware.btconfigstore@2.0-impl", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so", + ], + shared_libs: [ + "libbase", + "libcutils", + "libhidlbase", + "liblog", + "libutils", + "vendor.qti.hardware.btconfigstore@2.0", + "android.hardware.bluetooth@1.0-impl-qti", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + relative_install_path: "hw", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "vendor.qti.hardware.capabilityconfigstore@1.0-impl", owner: "xiaomi", @@ -8021,6 +8116,31 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "libsoc_helper", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libsoc_helper.so", + ], + shared_libs: [ + "libcutils", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "libspcom", owner: "xiaomi", @@ -9026,8 +9146,35 @@ cc_prebuilt_library_shared { ], shared_libs: [ "libhidlbase", - "libhidltransport", - "libhwbinder", + "liblog", + "libutils", + "libcutils", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + +cc_prebuilt_library_shared { + name: "vendor.qti.hardware.bluetooth_sar@1.1", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.1.so", + ], + shared_libs: [ + "vendor.qti.hardware.bluetooth_sar@1.0", + "libhidlbase", "liblog", "libutils", "libcutils", @@ -12996,13 +13143,13 @@ cc_prebuilt_binary { "liblog", "libcutils", "libutils", - "libhwbinder", "libhidlbase", - "libhidltransport", "android.hardware.bluetooth@1.0", "vendor.qti.hardware.fm@1.0_vendor", "vendor.qti.hardware.bluetooth_sar@1.0", + "vendor.qti.hardware.bluetooth_sar@1.1", "vendor.qti.hardware.btconfigstore@1.0", + "vendor.qti.hardware.btconfigstore@2.0", "libqti_vndfwk_detect", "libc++", "libc", diff --git a/proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti b/proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti index fb6f432..bcbfa78 100755 Binary files a/proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti and b/proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti differ diff --git a/proprietary/vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc b/proprietary/vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc index 22b71f4..e75e2a7 100644 --- a/proprietary/vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc +++ b/proprietary/vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc @@ -1,5 +1,5 @@ service vendor.bluetooth-1-0-qti /vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti class hal user bluetooth - group bluetooth system wakelock oem_2901 + group bluetooth system wakelock oem_2901 net_raw capabilities BLOCK_SUSPEND NET_ADMIN diff --git a/proprietary/vendor/lib/btaudio_offload_if.so b/proprietary/vendor/lib/btaudio_offload_if.so index db39590..4ed027e 100644 Binary files a/proprietary/vendor/lib/btaudio_offload_if.so and b/proprietary/vendor/lib/btaudio_offload_if.so differ diff --git a/proprietary/vendor/lib/hw/android.hardware.bluetooth@1.0-impl-qti.so b/proprietary/vendor/lib/hw/android.hardware.bluetooth@1.0-impl-qti.so new file mode 100644 index 0000000..db31e96 Binary files /dev/null and b/proprietary/vendor/lib/hw/android.hardware.bluetooth@1.0-impl-qti.so differ diff --git a/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so b/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so index 3479a76..7eddebe 100644 Binary files a/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so and b/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so differ diff --git a/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so b/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so new file mode 100644 index 0000000..d69b964 Binary files /dev/null and b/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so differ diff --git a/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_sar@1.1-impl.so b/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_sar@1.1-impl.so new file mode 100644 index 0000000..0f6ef1a Binary files /dev/null and b/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_sar@1.1-impl.so differ diff --git a/proprietary/vendor/lib/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so b/proprietary/vendor/lib/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so new file mode 100644 index 0000000..d66e75e Binary files /dev/null and b/proprietary/vendor/lib/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so differ diff --git a/proprietary/vendor/lib/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so b/proprietary/vendor/lib/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so new file mode 100644 index 0000000..e8d8892 Binary files /dev/null and b/proprietary/vendor/lib/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so differ diff --git a/proprietary/vendor/lib/libbluetooth_audio_session_qti.so b/proprietary/vendor/lib/libbluetooth_audio_session_qti.so index 6b77224..0b51fdb 100644 Binary files a/proprietary/vendor/lib/libbluetooth_audio_session_qti.so and b/proprietary/vendor/lib/libbluetooth_audio_session_qti.so differ diff --git a/proprietary/vendor/lib/libbluetooth_audio_session_qti_2_1.so b/proprietary/vendor/lib/libbluetooth_audio_session_qti_2_1.so new file mode 100644 index 0000000..876df78 Binary files /dev/null and b/proprietary/vendor/lib/libbluetooth_audio_session_qti_2_1.so differ diff --git a/proprietary/vendor/lib/libbt-hidlclient.so b/proprietary/vendor/lib/libbt-hidlclient.so new file mode 100644 index 0000000..d2def71 Binary files /dev/null and b/proprietary/vendor/lib/libbt-hidlclient.so differ diff --git a/proprietary/vendor/lib/libbtnv.so b/proprietary/vendor/lib/libbtnv.so new file mode 100644 index 0000000..4f60374 Binary files /dev/null and b/proprietary/vendor/lib/libbtnv.so differ diff --git a/proprietary/vendor/lib/libsoc_helper.so b/proprietary/vendor/lib/libsoc_helper.so new file mode 100644 index 0000000..7230497 Binary files /dev/null and b/proprietary/vendor/lib/libsoc_helper.so differ diff --git a/proprietary/vendor/lib/vendor.qti.hardware.bluetooth_sar@1.0.so b/proprietary/vendor/lib/vendor.qti.hardware.bluetooth_sar@1.0.so new file mode 100644 index 0000000..3221e5e Binary files /dev/null and b/proprietary/vendor/lib/vendor.qti.hardware.bluetooth_sar@1.0.so differ diff --git a/proprietary/vendor/lib/vendor.qti.hardware.bluetooth_sar@1.1.so b/proprietary/vendor/lib/vendor.qti.hardware.bluetooth_sar@1.1.so new file mode 100644 index 0000000..09d838c Binary files /dev/null and b/proprietary/vendor/lib/vendor.qti.hardware.bluetooth_sar@1.1.so differ diff --git a/proprietary/vendor/lib64/btaudio_offload_if.so b/proprietary/vendor/lib64/btaudio_offload_if.so new file mode 100644 index 0000000..72471ef Binary files /dev/null and b/proprietary/vendor/lib64/btaudio_offload_if.so differ diff --git a/proprietary/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so b/proprietary/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so index 8d36b65..99e0377 100644 Binary files a/proprietary/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so and b/proprietary/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so differ diff --git a/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so b/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so new file mode 100644 index 0000000..c577384 Binary files /dev/null and b/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so differ diff --git a/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so b/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so new file mode 100644 index 0000000..dafeefb Binary files /dev/null and b/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so differ diff --git a/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.0-impl.so b/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.0-impl.so deleted file mode 100644 index 5f014ee..0000000 Binary files a/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.0-impl.so and /dev/null differ diff --git a/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.1-impl.so b/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.1-impl.so new file mode 100644 index 0000000..ea72360 Binary files /dev/null and b/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.1-impl.so differ diff --git a/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so b/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so index 101655c..89944d8 100644 Binary files a/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so and b/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so differ diff --git a/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so b/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so new file mode 100644 index 0000000..7fd8e1e Binary files /dev/null and b/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so differ diff --git a/proprietary/vendor/lib64/libbluetooth_audio_session_qti.so b/proprietary/vendor/lib64/libbluetooth_audio_session_qti.so new file mode 100644 index 0000000..a3cdce2 Binary files /dev/null and b/proprietary/vendor/lib64/libbluetooth_audio_session_qti.so differ diff --git a/proprietary/vendor/lib64/libbluetooth_audio_session_qti_2_1.so b/proprietary/vendor/lib64/libbluetooth_audio_session_qti_2_1.so new file mode 100644 index 0000000..286cc47 Binary files /dev/null and b/proprietary/vendor/lib64/libbluetooth_audio_session_qti_2_1.so differ diff --git a/proprietary/vendor/lib64/libbt-hidlclient.so b/proprietary/vendor/lib64/libbt-hidlclient.so new file mode 100644 index 0000000..f140b2c Binary files /dev/null and b/proprietary/vendor/lib64/libbt-hidlclient.so differ diff --git a/proprietary/vendor/lib64/libbtnv.so b/proprietary/vendor/lib64/libbtnv.so index 154948c..be6b3dc 100644 Binary files a/proprietary/vendor/lib64/libbtnv.so and b/proprietary/vendor/lib64/libbtnv.so differ diff --git a/proprietary/vendor/lib64/libsoc_helper.so b/proprietary/vendor/lib64/libsoc_helper.so new file mode 100644 index 0000000..580f28c Binary files /dev/null and b/proprietary/vendor/lib64/libsoc_helper.so differ diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so index a19b64c..95198f2 100644 Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so and b/proprietary/vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so differ diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.1.so b/proprietary/vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.1.so new file mode 100644 index 0000000..057b8f9 Binary files /dev/null and b/proprietary/vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.1.so differ diff --git a/sdm845-common-vendor.mk b/sdm845-common-vendor.mk index 548ad4e..b6f252b 100644 --- a/sdm845-common-vendor.mk +++ b/sdm845-common-vendor.mk @@ -190,6 +190,7 @@ PRODUCT_PACKAGES += \ audio.primary.sdm845 \ sound_trigger.primary.sdm845 \ vendor.qti.hardware.bluetooth_audio@2.0-impl \ + vendor.qti.hardware.bluetooth_audio@2.1-impl \ libFileMux_proprietary \ libOmxVideoDSMode \ libOmxVpp \ @@ -206,6 +207,7 @@ PRODUCT_PACKAGES += \ libaudioroute_ext \ libbatterylistener \ libbluetooth_audio_session_qti \ + libbluetooth_audio_session_qti_2_1 \ libcapiv2svacnn \ libcapiv2vop \ libcomprcapture \ @@ -268,8 +270,9 @@ PRODUCT_PACKAGES += \ android.hardware.gatekeeper@1.0-impl-qti \ vendor.qti.esepowermanager@1.0-impl \ vendor.qti.hardware.alarm@1.0-impl \ - vendor.qti.hardware.bluetooth_sar@1.0-impl \ + vendor.qti.hardware.bluetooth_sar@1.1-impl \ vendor.qti.hardware.btconfigstore@1.0-impl \ + vendor.qti.hardware.btconfigstore@2.0-impl \ vendor.qti.hardware.capabilityconfigstore@1.0-impl \ vendor.qti.hardware.fm@1.0-impl \ vendor.qti.hardware.qteeconnector@1.0-impl \ @@ -363,6 +366,7 @@ PRODUCT_PACKAGES += \ libsecureui_svcsock \ libsensorcal \ libsettings \ + libsoc_helper \ libspcom \ libspl \ libssd \ @@ -396,6 +400,7 @@ PRODUCT_PACKAGES += \ vendor.qti.esepowermanager@1.0 \ vendor.qti.hardware.alarm@1.0 \ vendor.qti.hardware.bluetooth_sar@1.0 \ + vendor.qti.hardware.bluetooth_sar@1.1 \ vendor.qti.hardware.data.cne.internal.api@1.0 \ vendor.qti.hardware.data.cne.internal.constants@1.0 \ vendor.qti.hardware.data.cne.internal.server@1.0 \