diff --git a/Android.bp b/Android.bp index 463266c..5b315e1 100644 --- a/Android.bp +++ b/Android.bp @@ -330,174 +330,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "vendor.qti.hardware.bluetooth_audio@2.0-impl", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: [ - "proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so", - ], - shared_libs: [ - "android.hardware.audio.common@5.0", - "vendor.qti.hardware.bluetooth_audio@2.0", - "libbase", - "libbluetooth_audio_session_qti", - "libcutils", - "libfmq", - "libhidlbase", - "libhidltransport", - "liblog", - "libutils", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so", - ], - shared_libs: [ - "android.hardware.audio.common@5.0", - "vendor.qti.hardware.bluetooth_audio@2.0", - "libbase", - "libbluetooth_audio_session_qti", - "libcutils", - "libfmq", - "libhidlbase", - "libhidltransport", - "liblog", - "libutils", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "both", - relative_install_path: "hw", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "vendor.qti.hardware.bluetooth_sar@1.0-impl", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: [ - "proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_sar@1.0-impl.so", - ], - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libutils", - "liblog", - "libhwbinder", - "libbase", - "libcutils", - "libhardware", - "vendor.qti.hardware.bluetooth_sar@1.0", - "android.hardware.bluetooth@1.0", - "android.hardware.bluetooth@1.0-impl-qti", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.0-impl.so", - ], - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libutils", - "liblog", - "libhwbinder", - "libbase", - "libcutils", - "libhardware", - "vendor.qti.hardware.bluetooth_sar@1.0", - "android.hardware.bluetooth@1.0", - "android.hardware.bluetooth@1.0-impl-qti", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "both", - relative_install_path: "hw", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "vendor.qti.hardware.btconfigstore@1.0-impl", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: [ - "proprietary/vendor/lib/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so", - ], - shared_libs: [ - "libbase", - "libcutils", - "libhidlbase", - "libhidltransport", - "liblog", - "libhwbinder", - "libutils", - "vendor.qti.hardware.btconfigstore@1.0", - "android.hardware.bluetooth@1.0-impl-qti", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so", - ], - shared_libs: [ - "libbase", - "libcutils", - "libhidlbase", - "libhidltransport", - "liblog", - "libhwbinder", - "libutils", - "vendor.qti.hardware.btconfigstore@1.0", - "android.hardware.bluetooth@1.0-impl-qti", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "both", - relative_install_path: "hw", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "vulkan.msm8953", owner: "xiaomi", @@ -1553,59 +1385,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libbluetooth_audio_session_qti", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: [ - "proprietary/vendor/lib/libbluetooth_audio_session_qti.so", - ], - shared_libs: [ - "vendor.qti.hardware.bluetooth_audio@2.0", - "libaudioutils", - "libbase", - "libcutils", - "libfmq", - "libhidlbase", - "libhidltransport", - "liblog", - "libutils", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libbluetooth_audio_session_qti.so", - ], - shared_libs: [ - "vendor.qti.hardware.bluetooth_audio@2.0", - "libaudioutils", - "libbase", - "libcutils", - "libfmq", - "libhidlbase", - "libhidltransport", - "liblog", - "libutils", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "both", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libc2d30_bltlib", owner: "xiaomi", @@ -4109,53 +3888,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "vendor.qti.hardware.bluetooth_sar@1.0", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: [ - "proprietary/vendor/lib/vendor.qti.hardware.bluetooth_sar@1.0.so", - ], - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so", - ], - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "both", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "vendor.qti.hardware.data.cne.internal.api@1.0", owner: "xiaomi", @@ -5145,7 +4877,6 @@ cc_prebuilt_library_shared { "libbase", "libcutils", "libhidlbase", - "libhidltransport", "liblog", "libutils", "libdiag", @@ -5153,6 +4884,7 @@ cc_prebuilt_library_shared { "libqmi_cci", "libbtnv", "android.hardware.bluetooth@1.0", + "libsoc_helper", "libc++", "libc", "libm", @@ -5247,6 +4979,103 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "vendor.qti.hardware.bluetooth_sar@1.1-impl", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.1-impl.so", + ], + shared_libs: [ + "libhidlbase", + "libutils", + "liblog", + "libbase", + "libcutils", + "vendor.qti.hardware.bluetooth_sar@1.0", + "vendor.qti.hardware.bluetooth_sar@1.1", + "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.btconfigstore@1.0-impl", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so", + ], + shared_libs: [ + "libbase", + "libcutils", + "libhidlbase", + "liblog", + "libutils", + "vendor.qti.hardware.btconfigstore@1.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.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: "lib-imsSDP", owner: "xiaomi", @@ -5809,9 +5638,8 @@ cc_prebuilt_library_shared { shared_libs: [ "libutils", "libhidlbase", - "libhidltransport", "android.hardware.bluetooth@1.0", - "com.qualcomm.qti.ant@1.0", + "com.dsi.ant@1.0", "vendor.qti.hardware.fm@1.0", "liblog", "libc++", @@ -7182,6 +7010,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: "libssd", owner: "xiaomi", @@ -7798,6 +7651,63 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "vendor.qti.hardware.bluetooth_sar@1.0", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so", + ], + shared_libs: [ + "libhidlbase", + "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", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "vendor.qti.hardware.fm@1.0", owner: "xiaomi", @@ -7811,8 +7721,6 @@ cc_prebuilt_library_shared { ], shared_libs: [ "libhidlbase", - "libhidltransport", - "libhwbinder", "liblog", "libutils", "libcutils", @@ -9711,12 +9619,12 @@ cc_prebuilt_binary { "liblog", "libcutils", "libutils", - "libhwbinder", "libhidlbase", - "libhidltransport", "android.hardware.bluetooth@1.0", "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/msm8953-common-vendor.mk b/msm8953-common-vendor.mk index f0a3784..88d97ad 100644 --- a/msm8953-common-vendor.mk +++ b/msm8953-common-vendor.mk @@ -104,9 +104,6 @@ PRODUCT_PACKAGES += \ libGLESv2_adreno \ libQTapGLES \ libq3dtools_adreno \ - vendor.qti.hardware.bluetooth_audio@2.0-impl \ - vendor.qti.hardware.bluetooth_sar@1.0-impl \ - vendor.qti.hardware.btconfigstore@1.0-impl \ vulkan.msm8953 \ libC2D2 \ libCB \ @@ -133,7 +130,6 @@ PRODUCT_PACKAGES += \ libaudioconfigstore \ libaudioparsers \ libbccQTI \ - libbluetooth_audio_session_qti \ libc2d30_bltlib \ libcne \ libcneapiclient \ @@ -191,7 +187,6 @@ PRODUCT_PACKAGES += \ vendor.display.color@1.0 \ vendor.display.postproc@1.0 \ vendor.qti.data.factory@2.0 \ - vendor.qti.hardware.bluetooth_sar@1.0 \ 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 \ @@ -221,6 +216,9 @@ PRODUCT_PACKAGES += \ android.hardware.bluetooth@1.0-impl-qti \ vendor.qti.gnss@3.0-impl \ vendor.qti.hardware.alarm@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 \ lib-imsSDP \ lib-imscmservice \ lib-imsdpl \ @@ -282,6 +280,7 @@ PRODUCT_PACKAGES += \ libsecureui_svcsock \ libsettings \ libslimclient \ + libsoc_helper \ libssd \ libsystem_health_mon \ libthermalfeature \ @@ -302,6 +301,8 @@ PRODUCT_PACKAGES += \ vendor.qti.gnss@3.0-service \ vendor.qti.gnss@3.0 \ vendor.qti.hardware.alarm@1.0 \ + vendor.qti.hardware.bluetooth_sar@1.0 \ + vendor.qti.hardware.bluetooth_sar@1.1 \ vendor.qti.hardware.fm@1.0 \ vendor.qti.hardware.radio.am@1.0 \ vendor.qti.hardware.radio.ims@1.0 \ 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 f948865..43788d0 100644 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/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so b/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so deleted file mode 100644 index 70ce6cc..0000000 Binary files a/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so and /dev/null differ diff --git a/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_sar@1.0-impl.so b/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_sar@1.0-impl.so deleted file mode 100644 index 0efe88d..0000000 Binary files a/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_sar@1.0-impl.so and /dev/null 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 deleted file mode 100644 index d9f3f4a..0000000 Binary files a/proprietary/vendor/lib/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so and /dev/null differ diff --git a/proprietary/vendor/lib/libbluetooth_audio_session_qti.so b/proprietary/vendor/lib/libbluetooth_audio_session_qti.so deleted file mode 100644 index fd11572..0000000 Binary files a/proprietary/vendor/lib/libbluetooth_audio_session_qti.so and /dev/null 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 deleted file mode 100644 index b48e52a..0000000 Binary files a/proprietary/vendor/lib/vendor.qti.hardware.bluetooth_sar@1.0.so and /dev/null 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 9ce8bc3..221013a 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 deleted file mode 100644 index fc38752..0000000 Binary files a/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so and /dev/null 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 944dd61..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..89e9156 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 5cab7c7..3504ba4 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..e685022 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 deleted file mode 100644 index 20f7203..0000000 Binary files a/proprietary/vendor/lib64/libbluetooth_audio_session_qti.so and /dev/null differ diff --git a/proprietary/vendor/lib64/libbt-hidlclient.so b/proprietary/vendor/lib64/libbt-hidlclient.so index 9c127b6..186389e 100644 Binary files a/proprietary/vendor/lib64/libbt-hidlclient.so and b/proprietary/vendor/lib64/libbt-hidlclient.so differ diff --git a/proprietary/vendor/lib64/libbtnv.so b/proprietary/vendor/lib64/libbtnv.so index f83ea71..d57c551 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..02ab148 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 28e5361..72e3132 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..9e46b4f Binary files /dev/null and b/proprietary/vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.1.so differ diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.fm@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.fm@1.0.so index 660b99f..e569535 100644 Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.fm@1.0.so and b/proprietary/vendor/lib64/vendor.qti.hardware.fm@1.0.so differ