diff --git a/Android.bp b/Android.bp index b4f4a17..52ac9e2 100644 --- a/Android.bp +++ b/Android.bp @@ -1000,102 +1000,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "vendor.mediatek.hardware.bluetooth.audio@2.1", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: [ - "proprietary/vendor/lib/vendor.mediatek.hardware.bluetooth.audio@2.1.so", - ], - shared_libs: [ - "android.hardware.audio.common@5.0", - "android.hidl.safe_union@1.0", - "libhidlbase", - "liblog", - "libutils", - "libcutils", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/vendor.mediatek.hardware.bluetooth.audio@2.1.so", - ], - shared_libs: [ - "android.hardware.audio.common@5.0", - "android.hidl.safe_union@1.0", - "libhidlbase", - "liblog", - "libutils", - "libcutils", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "both", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "vendor.mediatek.hardware.bluetooth.audio@2.2", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: [ - "proprietary/vendor/lib/vendor.mediatek.hardware.bluetooth.audio@2.2.so", - ], - shared_libs: [ - "android.hardware.audio.common@5.0", - "vendor.mediatek.hardware.bluetooth.audio@2.1", - "android.hidl.safe_union@1.0", - "libhidlbase", - "liblog", - "libutils", - "libcutils", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/vendor.mediatek.hardware.bluetooth.audio@2.2.so", - ], - shared_libs: [ - "android.hardware.audio.common@5.0", - "vendor.mediatek.hardware.bluetooth.audio@2.1", - "android.hidl.safe_union@1.0", - "libhidlbase", - "liblog", - "libutils", - "libcutils", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "both", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libHEVCdec_sa.ca7.android", owner: "xiaomi", @@ -53040,6 +52944,42 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "sensors.touch.detect", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/sensors.touch.detect.so", + ], + shared_libs: [ + "liblog", + "libutils", + "libcutils", + "libhardware", + "libhidltransport", + "libhidlbase", + "android.hardware.sensors@1.0", + "android.hardware.sensors@2.0", + "android.hardware.sensors@2.0-ScopedWakelock", + "android.hardware.sensors@2.1", + "libfmq", + "libpower", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "libdlbvol", owner: "xiaomi", @@ -55470,6 +55410,7 @@ cc_prebuilt_binary { "proprietary/vendor/bin/hw/mtkfusionrild", ], shared_libs: [ + "libutils-v32", "libmtkrillog", "libmtkproperty", "libmtkcutils", diff --git a/beryl-vendor.mk b/beryl-vendor.mk index 3abf96a..5b1bb1f 100644 --- a/beryl-vendor.mk +++ b/beryl-vendor.mk @@ -133,9 +133,13 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/beryl/proprietary/vendor/etc/camera/beauty_config_gl.json:$(TARGET_COPY_OUT_VENDOR)/etc/camera/beauty_config_gl.json \ vendor/xiaomi/beryl/proprietary/vendor/etc/camera/dof_mecp/dof_mecp.bin:$(TARGET_COPY_OUT_VENDOR)/etc/camera/dof_mecp/dof_mecp.bin \ vendor/xiaomi/beryl/proprietary/vendor/etc/camera/eis/O17_f16M_w50M_i.bin:$(TARGET_COPY_OUT_VENDOR)/etc/camera/eis/O17_f16M_w50M_i.bin \ + vendor/xiaomi/beryl/proprietary/vendor/etc/camera/eis/O17_f16M_w50M_i_ITS.bin:$(TARGET_COPY_OUT_VENDOR)/etc/camera/eis/O17_f16M_w50M_i_ITS.bin \ vendor/xiaomi/beryl/proprietary/vendor/etc/camera/eis/O17_f16M_w50M_ii.bin:$(TARGET_COPY_OUT_VENDOR)/etc/camera/eis/O17_f16M_w50M_ii.bin \ + vendor/xiaomi/beryl/proprietary/vendor/etc/camera/eis/O17_f16M_w50M_ii_ITS.bin:$(TARGET_COPY_OUT_VENDOR)/etc/camera/eis/O17_f16M_w50M_ii_ITS.bin \ vendor/xiaomi/beryl/proprietary/vendor/etc/camera/eis/O17_f20M_w108M_u8M_i.bin:$(TARGET_COPY_OUT_VENDOR)/etc/camera/eis/O17_f20M_w108M_u8M_i.bin \ + vendor/xiaomi/beryl/proprietary/vendor/etc/camera/eis/O17_f20M_w108M_u8M_i_ITS.bin:$(TARGET_COPY_OUT_VENDOR)/etc/camera/eis/O17_f20M_w108M_u8M_i_ITS.bin \ vendor/xiaomi/beryl/proprietary/vendor/etc/camera/eis/O17_f20M_w108M_u8M_ii.bin:$(TARGET_COPY_OUT_VENDOR)/etc/camera/eis/O17_f20M_w108M_u8M_ii.bin \ + vendor/xiaomi/beryl/proprietary/vendor/etc/camera/eis/O17_f20M_w108M_u8M_ii_ITS.bin:$(TARGET_COPY_OUT_VENDOR)/etc/camera/eis/O17_f20M_w108M_u8M_ii_ITS.bin \ vendor/xiaomi/beryl/proprietary/vendor/etc/camera/golden/dualcamGolden_108M+8M_1/dualcam_cali_golden.bin:$(TARGET_COPY_OUT_VENDOR)/etc/camera/golden/dualcamGolden_108M+8M_1/dualcam_cali_golden.bin \ vendor/xiaomi/beryl/proprietary/vendor/etc/camera/golden/dualcamGolden_108M+8M_2/dualcam_cali_golden.bin:$(TARGET_COPY_OUT_VENDOR)/etc/camera/golden/dualcamGolden_108M+8M_2/dualcam_cali_golden.bin \ vendor/xiaomi/beryl/proprietary/vendor/etc/camera/golden/dualcamGolden_50M+2M_1/dualcam_cali_golden.bin:$(TARGET_COPY_OUT_VENDOR)/etc/camera/golden/dualcamGolden_50M+2M_1/dualcam_cali_golden.bin \ @@ -644,8 +648,6 @@ PRODUCT_PACKAGES += \ libmtk_drvb \ vendor.mediatek.hardware.audio@6.1 \ vendor.mediatek.hardware.audio@7.1 \ - vendor.mediatek.hardware.bluetooth.audio@2.1 \ - vendor.mediatek.hardware.bluetooth.audio@2.2 \ libHEVCdec_sa.ca7.android \ libh264dec_customize \ libh264dec_sa.ca7 \ @@ -2586,6 +2588,7 @@ PRODUCT_PACKAGES += \ sc820cs_ofilm_ultra_ii_mipi_raw_india_tuning \ sc820cs_ofilm_ultra_ii_mipi_raw_tuning \ libmtkcam_streaminfo_plugin-p1stt \ + sensors.touch.detect \ libdlbvol \ libmisoundfx \ libswdap \ diff --git a/proprietary/vendor/bin/hw/mtkfusionrild b/proprietary/vendor/bin/hw/mtkfusionrild index ffc7561..c230df3 100755 Binary files a/proprietary/vendor/bin/hw/mtkfusionrild and b/proprietary/vendor/bin/hw/mtkfusionrild differ diff --git a/proprietary/vendor/etc/camera/eis/O17_f16M_w50M_i_ITS.bin b/proprietary/vendor/etc/camera/eis/O17_f16M_w50M_i_ITS.bin new file mode 100644 index 0000000..a8eac28 Binary files /dev/null and b/proprietary/vendor/etc/camera/eis/O17_f16M_w50M_i_ITS.bin differ diff --git a/proprietary/vendor/etc/camera/eis/O17_f16M_w50M_ii_ITS.bin b/proprietary/vendor/etc/camera/eis/O17_f16M_w50M_ii_ITS.bin new file mode 100644 index 0000000..eff675d Binary files /dev/null and b/proprietary/vendor/etc/camera/eis/O17_f16M_w50M_ii_ITS.bin differ diff --git a/proprietary/vendor/etc/camera/eis/O17_f20M_w108M_u8M_i_ITS.bin b/proprietary/vendor/etc/camera/eis/O17_f20M_w108M_u8M_i_ITS.bin new file mode 100644 index 0000000..26c9593 Binary files /dev/null and b/proprietary/vendor/etc/camera/eis/O17_f20M_w108M_u8M_i_ITS.bin differ diff --git a/proprietary/vendor/etc/camera/eis/O17_f20M_w108M_u8M_ii_ITS.bin b/proprietary/vendor/etc/camera/eis/O17_f20M_w108M_u8M_ii_ITS.bin new file mode 100644 index 0000000..a927623 Binary files /dev/null and b/proprietary/vendor/etc/camera/eis/O17_f20M_w108M_u8M_ii_ITS.bin differ diff --git a/proprietary/vendor/lib/vendor.mediatek.hardware.bluetooth.audio@2.1.so b/proprietary/vendor/lib/vendor.mediatek.hardware.bluetooth.audio@2.1.so deleted file mode 100644 index da78240..0000000 Binary files a/proprietary/vendor/lib/vendor.mediatek.hardware.bluetooth.audio@2.1.so and /dev/null differ diff --git a/proprietary/vendor/lib/vendor.mediatek.hardware.bluetooth.audio@2.2.so b/proprietary/vendor/lib/vendor.mediatek.hardware.bluetooth.audio@2.2.so deleted file mode 100644 index 22f3fd2..0000000 Binary files a/proprietary/vendor/lib/vendor.mediatek.hardware.bluetooth.audio@2.2.so and /dev/null differ diff --git a/proprietary/vendor/lib64/sensors.touch.detect.so b/proprietary/vendor/lib64/sensors.touch.detect.so new file mode 100644 index 0000000..bb95117 Binary files /dev/null and b/proprietary/vendor/lib64/sensors.touch.detect.so differ diff --git a/proprietary/vendor/lib64/vendor.mediatek.hardware.bluetooth.audio@2.1.so b/proprietary/vendor/lib64/vendor.mediatek.hardware.bluetooth.audio@2.1.so deleted file mode 100644 index 105b7eb..0000000 Binary files a/proprietary/vendor/lib64/vendor.mediatek.hardware.bluetooth.audio@2.1.so and /dev/null differ diff --git a/proprietary/vendor/lib64/vendor.mediatek.hardware.bluetooth.audio@2.2.so b/proprietary/vendor/lib64/vendor.mediatek.hardware.bluetooth.audio@2.2.so deleted file mode 100644 index c5e7d51..0000000 Binary files a/proprietary/vendor/lib64/vendor.mediatek.hardware.bluetooth.audio@2.2.so and /dev/null differ