diff --git a/Android.bp b/Android.bp index d039404..0cd9a99 100644 --- a/Android.bp +++ b/Android.bp @@ -5035,6 +5035,42 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "android.hardware.bluetooth@1.0-impl-qti", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so", + ], + shared_libs: [ + "libbase", + "libcutils", + "libhidlbase", + "libhidltransport", + "liblog", + "libutils", + "libdiag", + "libqmiservices", + "libqmi_cci", + "libbtnv", + "android.hardware.bluetooth@1.0", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + relative_install_path: "hw", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "android.hardware.gatekeeper@1.0-impl-qti", owner: "xiaomi", @@ -5133,6 +5169,76 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "vendor.qti.hardware.bluetooth_sar@1.0-impl", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + 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: "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", + "libhidltransport", + "liblog", + "libhwbinder", + "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.capabilityconfigstore@1.0-impl", owner: "xiaomi", @@ -5167,6 +5273,40 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "vendor.qti.hardware.fm@1.0-impl", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so", + ], + shared_libs: [ + "libbase", + "libcutils", + "libhidlbase", + "libhidltransport", + "liblog", + "libhwbinder", + "libutils", + "vendor.qti.hardware.fm@1.0_vendor", + "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.qteeconnector@1.0-impl", owner: "xiaomi", @@ -5904,6 +6044,30 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "libbtnv", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libbtnv.so", + ], + shared_libs: [ + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "libcne", owner: "xiaomi", @@ -8286,6 +8450,36 @@ 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", + "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.data.cne.internal.api@1.0", owner: "xiaomi", @@ -8564,6 +8758,37 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "vendor.qti.hardware.fm@1.0_vendor", + stem: "vendor.qti.hardware.fm@1.0", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/vendor.qti.hardware.fm@1.0.so", + ], + 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.qteeconnector@1.0", owner: "xiaomi", @@ -11003,6 +11228,34 @@ cc_prebuilt_library_shared { system_ext_specific: true, } +cc_prebuilt_library_shared { + name: "fm_helium", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/system_ext/lib64/fm_helium.so", + ], + shared_libs: [ + "libfm-hci", + "liblog", + "libnativehelper", + "libcutils", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + system_ext_specific: true, +} + cc_prebuilt_library_shared { name: "lib-imsvideocodec", owner: "xiaomi", @@ -11283,6 +11536,39 @@ cc_prebuilt_library_shared { system_ext_specific: true, } +cc_prebuilt_library_shared { + name: "libfm-hci", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/system_ext/lib64/libfm-hci.so", + ], + shared_libs: [ + "libcutils", + "libbase", + "libhidlbase", + "libhidltransport", + "libhwbinder", + "liblog", + "libutils", + "android.hidl.base@1.0", + "vendor.qti.hardware.fm@1.0", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + system_ext_specific: true, +} + cc_prebuilt_library_shared { name: "libimscamera_jni", owner: "xiaomi", @@ -11384,6 +11670,36 @@ cc_prebuilt_library_shared { system_ext_specific: true, } +cc_prebuilt_library_shared { + name: "vendor.qti.hardware.fm@1.0", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/system_ext/lib64/vendor.qti.hardware.fm@1.0.so", + ], + shared_libs: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "liblog", + "libutils", + "libcutils", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + system_ext_specific: true, +} + cc_prebuilt_library_shared { name: "vendor.qti.hardware.radio.ims@1.0", owner: "xiaomi", @@ -12100,6 +12416,42 @@ cc_prebuilt_binary { soc_specific: true, } +cc_prebuilt_binary { + name: "android.hardware.bluetooth@1.0-service-qti", + owner: "xiaomi", + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti", + ], + shared_libs: [ + "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.btconfigstore@1.0", + "libqti_vndfwk_detect", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + strip: { + none: true, + }, + prefer: true, + relative_install_path: "hw", + soc_specific: true, +} + cc_prebuilt_binary { name: "android.hardware.drm@1.2-service.widevine", owner: "xiaomi", diff --git a/proprietary/system_ext/lib64/fm_helium.so b/proprietary/system_ext/lib64/fm_helium.so new file mode 100644 index 0000000..12fd592 Binary files /dev/null and b/proprietary/system_ext/lib64/fm_helium.so differ diff --git a/proprietary/system_ext/lib64/libfm-hci.so b/proprietary/system_ext/lib64/libfm-hci.so new file mode 100644 index 0000000..5dd95d8 Binary files /dev/null and b/proprietary/system_ext/lib64/libfm-hci.so differ diff --git a/proprietary/system_ext/lib64/vendor.qti.hardware.fm@1.0.so b/proprietary/system_ext/lib64/vendor.qti.hardware.fm@1.0.so new file mode 100644 index 0000000..33ef622 Binary files /dev/null and b/proprietary/system_ext/lib64/vendor.qti.hardware.fm@1.0.so differ 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 new file mode 100755 index 0000000..fb6f432 Binary files /dev/null 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 new file mode 100644 index 0000000..22b71f4 --- /dev/null +++ b/proprietary/vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc @@ -0,0 +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 + capabilities BLOCK_SUSPEND NET_ADMIN 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 new file mode 100644 index 0000000..8d36b65 Binary files /dev/null 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_sar@1.0-impl.so b/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.0-impl.so new file mode 100644 index 0000000..5f014ee Binary files /dev/null and b/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.0-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 new file mode 100644 index 0000000..101655c Binary files /dev/null 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.fm@1.0-impl.so b/proprietary/vendor/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so new file mode 100644 index 0000000..5cb083c Binary files /dev/null and b/proprietary/vendor/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so differ diff --git a/proprietary/vendor/lib64/libbtnv.so b/proprietary/vendor/lib64/libbtnv.so new file mode 100644 index 0000000..154948c Binary files /dev/null and b/proprietary/vendor/lib64/libbtnv.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 new file mode 100644 index 0000000..a19b64c Binary files /dev/null and b/proprietary/vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.0.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 new file mode 100644 index 0000000..ceb0446 Binary files /dev/null and b/proprietary/vendor/lib64/vendor.qti.hardware.fm@1.0.so differ diff --git a/sdm845-common-vendor.mk b/sdm845-common-vendor.mk index 9e85c16..d99c502 100644 --- a/sdm845-common-vendor.mk +++ b/sdm845-common-vendor.mk @@ -48,6 +48,7 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/sdm845-common/proprietary/vendor/etc/configstore/vpp.configstore.xml:$(TARGET_COPY_OUT_VENDOR)/etc/configstore/vpp.configstore.xml \ vendor/xiaomi/sdm845-common/proprietary/vendor/etc/data/dsi_config.xml:$(TARGET_COPY_OUT_VENDOR)/etc/data/dsi_config.xml \ vendor/xiaomi/sdm845-common/proprietary/vendor/etc/data/netmgr_config.xml:$(TARGET_COPY_OUT_VENDOR)/etc/data/netmgr_config.xml \ + vendor/xiaomi/sdm845-common/proprietary/vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.bluetooth@1.0-service-qti.rc \ vendor/xiaomi/sdm845-common/proprietary/vendor/etc/init/android.hardware.drm@1.1-service.wfdhdcp.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.drm@1.1-service.wfdhdcp.rc \ vendor/xiaomi/sdm845-common/proprietary/vendor/etc/init/android.hardware.drm@1.2-service.widevine.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.drm@1.2-service.widevine.rc \ vendor/xiaomi/sdm845-common/proprietary/vendor/etc/init/android.hardware.gatekeeper@1.0-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.gatekeeper@1.0-service-qti.rc \ @@ -252,10 +253,14 @@ PRODUCT_PACKAGES += \ com.qualcomm.qti.imscmservice@2.2_vendor \ com.qualcomm.qti.uceservice@2.0_vendor \ com.qualcomm.qti.uceservice@2.1_vendor \ + android.hardware.bluetooth@1.0-impl-qti \ 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.btconfigstore@1.0-impl \ vendor.qti.hardware.capabilityconfigstore@1.0-impl \ + vendor.qti.hardware.fm@1.0-impl \ vendor.qti.hardware.qteeconnector@1.0-impl \ vendor.qti.hardware.sensorscalibrate@1.0-impl \ vendor.qti.hardware.soter@1.0-impl \ @@ -279,6 +284,7 @@ PRODUCT_PACKAGES += \ libQTEEConnector_vendor \ libSecureUILib \ libStDrvInt \ + libbtnv \ libcne \ libcneapiclient \ libcneoplookup \ @@ -357,6 +363,7 @@ PRODUCT_PACKAGES += \ vendor.qti.data.factory@2.0 \ vendor.qti.esepowermanager@1.0 \ vendor.qti.hardware.alarm@1.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 \ @@ -366,6 +373,7 @@ PRODUCT_PACKAGES += \ vendor.qti.hardware.data.iwlan@1.0 \ vendor.qti.hardware.data.latency@1.0 \ vendor.qti.hardware.data.qmi@1.0 \ + vendor.qti.hardware.fm@1.0_vendor \ vendor.qti.hardware.qteeconnector@1.0 \ vendor.qti.hardware.radio.am@1.0 \ vendor.qti.hardware.radio.atcmdfwd@1.0 \ @@ -445,6 +453,7 @@ PRODUCT_PACKAGES += \ com.qualcomm.qti.imscmservice@2.2 \ com.qualcomm.qti.uceservice@2.0 \ com.qualcomm.qti.uceservice@2.1 \ + fm_helium \ lib-imsvideocodec \ lib-imsvt \ lib-imsvtextutils \ @@ -454,9 +463,11 @@ PRODUCT_PACKAGES += \ libdpmfdmgr \ libdpmframework \ libdpmtcm \ + libfm-hci \ libimscamera_jni \ libimsmedia_jni \ libwfdnative \ + vendor.qti.hardware.fm@1.0 \ vendor.qti.hardware.radio.ims@1.0 \ vendor.qti.hardware.radio.ims@1.1 \ vendor.qti.hardware.radio.ims@1.2 \ @@ -493,6 +504,7 @@ PRODUCT_PACKAGES += \ cnss-daemon \ dpmQmiMgr \ hvdcp_opti \ + android.hardware.bluetooth@1.0-service-qti \ android.hardware.drm@1.2-service.widevine \ android.hardware.gatekeeper@1.0-service-qti \ android.hardware.neuralnetworks@1.2-service-qti \