diff --git a/Android.bp b/Android.bp index 7a4641e..5813283 100644 --- a/Android.bp +++ b/Android.bp @@ -2046,6 +2046,102 @@ 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: "vendor.mediatek.hardware.nvram@1.0", owner: "xiaomi", @@ -19661,170 +19757,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libcodec2_hidl@1.0-v31", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libcodec2_hidl@1.0-v31.so", - ], - shared_libs: [ - "libbase_shim", - "android.hardware.graphics.bufferqueue@1.0", - "android.hardware.graphics.bufferqueue@2.0", - "android.hardware.graphics.common@1.0", - "android.hardware.media@1.0", - "android.hardware.media.bufferpool@2.0", - "android.hardware.media.c2@1.0", - "android.hardware.media.omx@1.0", - "libbase", - "libcodec2", - "libcodec2_vndk-v31", - "libcutils", - "libhidlbase", - "liblog", - "libstagefright_bufferpool@2.0.1", - "libui-v34", - "libutils", - "libstagefright_bufferqueue_helper-v33", - "libcodec2_hidl_plugin-v31", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libcodec2_hidl@1.1-v31", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libcodec2_hidl@1.1-v31.so", - ], - shared_libs: [ - "libbase_shim", - "android.hardware.graphics.bufferqueue@1.0", - "android.hardware.graphics.bufferqueue@2.0", - "android.hardware.graphics.common@1.0", - "android.hardware.media@1.0", - "android.hardware.media.bufferpool@2.0", - "android.hardware.media.c2@1.0", - "android.hardware.media.c2@1.1", - "android.hardware.media.omx@1.0", - "libbase", - "libcodec2", - "libcodec2_hidl@1.0-v31", - "libcodec2_vndk-v31", - "libcutils", - "libhidlbase", - "liblog", - "libstagefright_bufferpool@2.0.1", - "libui-v34", - "libutils", - "libstagefright_bufferqueue_helper-v33", - "libcodec2_hidl_plugin-v31", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libcodec2_hidl@1.2-v31", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libcodec2_hidl@1.2-v31.so", - ], - shared_libs: [ - "libbase_shim", - "android.hardware.graphics.bufferqueue@1.0", - "android.hardware.graphics.bufferqueue@2.0", - "android.hardware.graphics.common@1.0", - "android.hardware.media@1.0", - "android.hardware.media.bufferpool@2.0", - "android.hardware.media.c2@1.0", - "android.hardware.media.c2@1.1", - "android.hardware.media.c2@1.2", - "android.hardware.media.omx@1.0", - "libbase", - "libcodec2", - "libcodec2_hidl@1.0-v31", - "libcodec2_hidl@1.1-v31", - "libcodec2_vndk-v31", - "libcutils", - "libhidlbase", - "liblog", - "libstagefright_bufferpool@2.0.1", - "libui-v34", - "libutils", - "libstagefright_bufferqueue_helper-v33", - "libcodec2_hidl_plugin-v31", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libcodec2_hidl_plugin-v31", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libcodec2_hidl_plugin-v31.so", - ], - shared_libs: [ - "libbase", - "libcodec2", - "libcodec2_vndk-v31", - "liblog", - "libutils", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libcodec2_mtk_c2store", owner: "xiaomi", @@ -19837,14 +19769,14 @@ cc_prebuilt_library_shared { "proprietary/vendor/lib64/libcodec2_mtk_c2store.so", ], shared_libs: [ - "libcodec2_soft_common-v31", + "libcodec2_soft_common", "libcutils", "liblog", - "libsfplugin_ccodec_utils-v31", - "libstagefright_foundation-v33", + "libsfplugin_ccodec_utils", + "libstagefright_foundation", "libbase", "libcodec2", - "libcodec2_vndk-v31", + "libcodec2_vndk", "libutils", "libion", "libion_mtk", @@ -19876,21 +19808,21 @@ cc_prebuilt_library_shared { "libformatter", "libdpframework", "android.hardware.graphics.bufferqueue@2.0", - "libui-v34", + "libui", "libgralloc_extra", "libexpat", "libsync", "libhidlbase", "libhwbinder", "libged", - "libcodec2_soft_common-v31", + "libcodec2_soft_common", "libcutils", "liblog", - "libsfplugin_ccodec_utils-v31", - "libstagefright_foundation-v33", + "libsfplugin_ccodec_utils", + "libstagefright_foundation", "libbase", "libcodec2", - "libcodec2_vndk-v31", + "libcodec2_vndk", "libutils", "libion", "libdmabufheap", @@ -19925,21 +19857,21 @@ cc_prebuilt_library_shared { "libformatter", "libdpframework", "android.hardware.graphics.bufferqueue@2.0", - "libui-v34", + "libui", "libgralloc_extra", "libexpat", "libsync", "libhidlbase", "libhwbinder", "libged", - "libcodec2_soft_common-v31", + "libcodec2_soft_common", "libcutils", "liblog", - "libsfplugin_ccodec_utils-v31", - "libstagefright_foundation-v33", + "libsfplugin_ccodec_utils", + "libstagefright_foundation", "libbase", "libcodec2", - "libcodec2_vndk-v31", + "libcodec2_vndk", "libutils", "libion", "libdmabufheap", @@ -19957,38 +19889,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libcodec2_soft_common-v31", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libcodec2_soft_common-v31.so", - ], - shared_libs: [ - "libbase", - "libcodec2", - "libcodec2_vndk-v31", - "libutils", - "libcutils", - "liblog", - "libsfplugin_ccodec_utils-v31", - "libstagefright_foundation-v33", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libcodec2_soft_mtk_alacdec", owner: "xiaomi", @@ -20161,46 +20061,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libcodec2_vndk-v31", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libcodec2_vndk-v31.so", - ], - shared_libs: [ - "android.hardware.graphics.bufferqueue@2.0", - "android.hardware.graphics.common@1.2", - "android.hardware.media.bufferpool@2.0", - "libbase", - "libcutils", - "libhardware", - "libhidlbase", - "libion", - "libdmabufheap", - "libfmq", - "liblog", - "libnativewindow", - "libstagefright_foundation-v33", - "libstagefright_bufferpool@2.0.1", - "libui-v34", - "libutils", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libcodec2_vpp_qt_plugin", owner: "xiaomi", @@ -20213,11 +20073,11 @@ cc_prebuilt_library_shared { "proprietary/vendor/lib64/libcodec2_vpp_qt_plugin.so", ], shared_libs: [ - "libcodec2_soft_common-v31", - "libsfplugin_ccodec_utils-v31", - "libstagefright_foundation-v33", + "libcodec2_soft_common", + "libsfplugin_ccodec_utils", + "libstagefright_foundation", "libcodec2", - "libcodec2_vndk-v31", + "libcodec2_vndk", "liblog", "libbase", "libutils", @@ -20246,11 +20106,11 @@ cc_prebuilt_library_shared { "proprietary/vendor/lib64/libcodec2_vpp_rs_plugin.so", ], shared_libs: [ - "libcodec2_soft_common-v31", - "libsfplugin_ccodec_utils-v31", - "libstagefright_foundation-v33", + "libcodec2_soft_common", + "libsfplugin_ccodec_utils", + "libstagefright_foundation", "libcodec2", - "libcodec2_vndk-v31", + "libcodec2_vndk", "liblog", "libbase", "libutils", @@ -25461,38 +25321,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libsfplugin_ccodec_utils-v31", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libsfplugin_ccodec_utils-v31.so", - ], - shared_libs: [ - "libbase", - "libcodec2", - "libcodec2_vndk-v31", - "libcutils", - "liblog", - "libnativewindow", - "libstagefright_foundation", - "libutils", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libsimaka", owner: "xiaomi", @@ -25596,41 +25424,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libstagefright_bufferqueue_helper-v33", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libstagefright_bufferqueue_helper-v33.so", - ], - shared_libs: [ - "libbase", - "libcutils", - "libhidlbase", - "libhidlmemory", - "liblog", - "libstagefright_foundation", - "libui", - "libutils", - "android.hardware.graphics.bufferqueue@1.0", - "android.hardware.graphics.bufferqueue@2.0", - "libgui", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libstereoinfoaccessor_vsdof", owner: "xiaomi", @@ -29506,9 +29299,9 @@ prebuilt_etc_xml { } prebuilt_etc_xml { - name: "manifest_media_c2_V1_2_default.xml", + name: "manifest_media_c2_V1_1_default.xml", owner: "xiaomi", - src: "proprietary/vendor/etc/vintf/manifest/manifest_media_c2_V1_2_default.xml", + src: "proprietary/vendor/etc/vintf/manifest/manifest_media_c2_V1_1_default.xml", filename_from_src: true, sub_dir: "vintf/manifest", soc_specific: true, @@ -29739,14 +29532,6 @@ cc_prebuilt_binary { soc_specific: true, } -sh_binary { - name: "chipinfo", - owner: "xiaomi", - src: "proprietary/vendor/bin/chipinfo", - filename: "chipinfo", - soc_specific: true, -} - cc_prebuilt_binary { name: "consumerird", owner: "xiaomi", @@ -30008,6 +29793,7 @@ cc_prebuilt_binary { "proprietary/vendor/bin/hw/android.hardware.media.c2@1.2-mediatek-64b", ], shared_libs: [ + "libstagefright_foundation-v33", "libbase", "liblog", "libcodec2", @@ -30015,10 +29801,10 @@ cc_prebuilt_binary { "android.hardware.media.c2@1.0", "android.hardware.media.c2@1.1", "android.hardware.media.c2@1.2", - "libcodec2_hidl@1.0-v31", - "libcodec2_hidl@1.1-v31", - "libcodec2_hidl@1.2-v31", - "libcodec2_vndk-v31", + "libcodec2_hidl@1.0", + "libcodec2_hidl@1.1", + "libcodec2_hidl@1.2", + "libcodec2_vndk", "libhidlbase", "libavservices_minijail", "libbinder", diff --git a/proprietary/vendor/bin/chipinfo b/proprietary/vendor/bin/chipinfo deleted file mode 100755 index 914e7e3..0000000 --- a/proprietary/vendor/bin/chipinfo +++ /dev/null @@ -1,31 +0,0 @@ -#!/vendor/bin/sh - -default_fact_prop=$(getprop ro.soc.manufacturer) - -if [ "$default_fact_prop" == "" ]; then - fact_val=$(cat /sys/devices/soc0/family) - /vendor/bin/setprop ro.vendor.soc.manufacturer ${fact_val} -fi - -default_soc_prop=$(getprop ro.soc.model) - -if [ "$default_soc_prop" == "" ]; then - soc_val=$(cat /sys/devices/soc0/soc_id) - /vendor/bin/setprop ro.vendor.soc.model ${soc_val} -else - soc_val="$default_soc_prop" -fi - -soc_ext_val=$(cat /proc/device-tree/model-external-name 2>/dev/null) -if [ -z "$soc_ext_val" ]; then - soc_ext_val=${soc_val} -fi -/vendor/bin/setprop ro.vendor.soc.model.external_name ${soc_ext_val} - -soc_part_val=$(cat /proc/device-tree/model-part-name 2>/dev/null) -if [ -z "$soc_part_val" ]; then - soc_part_val=${soc_val} -fi -/vendor/bin/setprop ro.vendor.soc.model.part_name ${soc_part_val} - -/vendor/bin/setprop ro.vendor.soc.model_ready 1 diff --git a/proprietary/vendor/bin/hw/android.hardware.media.c2@1.2-mediatek-64b b/proprietary/vendor/bin/hw/android.hardware.media.c2@1.2-mediatek-64b index b03b586..6468e0e 100755 Binary files a/proprietary/vendor/bin/hw/android.hardware.media.c2@1.2-mediatek-64b and b/proprietary/vendor/bin/hw/android.hardware.media.c2@1.2-mediatek-64b differ diff --git a/proprietary/vendor/etc/init/chipinfo_init.rc b/proprietary/vendor/etc/init/chipinfo_init.rc deleted file mode 100644 index 708c1ef..0000000 --- a/proprietary/vendor/etc/init/chipinfo_init.rc +++ /dev/null @@ -1,7 +0,0 @@ -on early-init - exec_background - system system -- /vendor/bin/chipinfo - -on post-fs-data - wait_for_prop ro.vendor.soc.model_ready 1 - setprop ro.soc.model ${ro.vendor.soc.model} - setprop ro.soc.manufacturer ${ro.vendor.soc.manufacturer} \ No newline at end of file diff --git a/proprietary/vendor/etc/vintf/manifest/manifest_media_c2_V1_2_default.xml b/proprietary/vendor/etc/vintf/manifest/manifest_media_c2_V1_1_default.xml similarity index 90% rename from proprietary/vendor/etc/vintf/manifest/manifest_media_c2_V1_2_default.xml rename to proprietary/vendor/etc/vintf/manifest/manifest_media_c2_V1_1_default.xml index a5e8d87..bf0d72f 100644 --- a/proprietary/vendor/etc/vintf/manifest/manifest_media_c2_V1_2_default.xml +++ b/proprietary/vendor/etc/vintf/manifest/manifest_media_c2_V1_1_default.xml @@ -2,7 +2,7 @@ android.hardware.media.c2 hwbinder - 1.2 + 1.1 IComponentStore default 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 new file mode 100644 index 0000000..7e73dcf Binary files /dev/null and b/proprietary/vendor/lib/vendor.mediatek.hardware.bluetooth.audio@2.1.so 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 new file mode 100644 index 0000000..96fee57 Binary files /dev/null and b/proprietary/vendor/lib/vendor.mediatek.hardware.bluetooth.audio@2.2.so differ diff --git a/proprietary/vendor/lib64/libcodec2_hidl@1.0-v31.so b/proprietary/vendor/lib64/libcodec2_hidl@1.0-v31.so deleted file mode 100644 index b3599a2..0000000 Binary files a/proprietary/vendor/lib64/libcodec2_hidl@1.0-v31.so and /dev/null differ diff --git a/proprietary/vendor/lib64/libcodec2_hidl@1.1-v31.so b/proprietary/vendor/lib64/libcodec2_hidl@1.1-v31.so deleted file mode 100644 index 45ec8d5..0000000 Binary files a/proprietary/vendor/lib64/libcodec2_hidl@1.1-v31.so and /dev/null differ diff --git a/proprietary/vendor/lib64/libcodec2_hidl@1.2-v31.so b/proprietary/vendor/lib64/libcodec2_hidl@1.2-v31.so deleted file mode 100644 index 0f4a14c..0000000 Binary files a/proprietary/vendor/lib64/libcodec2_hidl@1.2-v31.so and /dev/null differ diff --git a/proprietary/vendor/lib64/libcodec2_hidl_plugin-v31.so b/proprietary/vendor/lib64/libcodec2_hidl_plugin-v31.so deleted file mode 100644 index d5e84c6..0000000 Binary files a/proprietary/vendor/lib64/libcodec2_hidl_plugin-v31.so and /dev/null differ diff --git a/proprietary/vendor/lib64/libcodec2_mtk_c2store.so b/proprietary/vendor/lib64/libcodec2_mtk_c2store.so index c687812..bb2c3c7 100644 Binary files a/proprietary/vendor/lib64/libcodec2_mtk_c2store.so and b/proprietary/vendor/lib64/libcodec2_mtk_c2store.so differ diff --git a/proprietary/vendor/lib64/libcodec2_mtk_vdec.so b/proprietary/vendor/lib64/libcodec2_mtk_vdec.so index 6fc150a..e638eeb 100644 Binary files a/proprietary/vendor/lib64/libcodec2_mtk_vdec.so and b/proprietary/vendor/lib64/libcodec2_mtk_vdec.so differ diff --git a/proprietary/vendor/lib64/libcodec2_mtk_venc.so b/proprietary/vendor/lib64/libcodec2_mtk_venc.so index a56787f..cfd91aa 100644 Binary files a/proprietary/vendor/lib64/libcodec2_mtk_venc.so and b/proprietary/vendor/lib64/libcodec2_mtk_venc.so differ diff --git a/proprietary/vendor/lib64/libcodec2_soft_common-v31.so b/proprietary/vendor/lib64/libcodec2_soft_common-v31.so deleted file mode 100644 index 5d0adcc..0000000 Binary files a/proprietary/vendor/lib64/libcodec2_soft_common-v31.so and /dev/null differ diff --git a/proprietary/vendor/lib64/libcodec2_vndk-v31.so b/proprietary/vendor/lib64/libcodec2_vndk-v31.so deleted file mode 100644 index 248f799..0000000 Binary files a/proprietary/vendor/lib64/libcodec2_vndk-v31.so and /dev/null differ diff --git a/proprietary/vendor/lib64/libcodec2_vpp_qt_plugin.so b/proprietary/vendor/lib64/libcodec2_vpp_qt_plugin.so index 1e580cc..7740949 100644 Binary files a/proprietary/vendor/lib64/libcodec2_vpp_qt_plugin.so and b/proprietary/vendor/lib64/libcodec2_vpp_qt_plugin.so differ diff --git a/proprietary/vendor/lib64/libcodec2_vpp_rs_plugin.so b/proprietary/vendor/lib64/libcodec2_vpp_rs_plugin.so index b259905..0f5c07c 100644 Binary files a/proprietary/vendor/lib64/libcodec2_vpp_rs_plugin.so and b/proprietary/vendor/lib64/libcodec2_vpp_rs_plugin.so differ diff --git a/proprietary/vendor/lib64/libsfplugin_ccodec_utils-v31.so b/proprietary/vendor/lib64/libsfplugin_ccodec_utils-v31.so deleted file mode 100644 index ebb7666..0000000 Binary files a/proprietary/vendor/lib64/libsfplugin_ccodec_utils-v31.so and /dev/null differ diff --git a/proprietary/vendor/lib64/libstagefright_bufferqueue_helper-v33.so b/proprietary/vendor/lib64/libstagefright_bufferqueue_helper-v33.so deleted file mode 100644 index caa5644..0000000 Binary files a/proprietary/vendor/lib64/libstagefright_bufferqueue_helper-v33.so and /dev/null 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 new file mode 100644 index 0000000..0e770e9 Binary files /dev/null and b/proprietary/vendor/lib64/vendor.mediatek.hardware.bluetooth.audio@2.1.so 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 new file mode 100644 index 0000000..8d4da54 Binary files /dev/null and b/proprietary/vendor/lib64/vendor.mediatek.hardware.bluetooth.audio@2.2.so differ diff --git a/rosemary-vendor.mk b/rosemary-vendor.mk index 9e4249e..4251057 100644 --- a/rosemary-vendor.mk +++ b/rosemary-vendor.mk @@ -195,7 +195,6 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/rosemary/proprietary/vendor/etc/init/android.hardware.neuralnetworks@1.3-service-mtk-neuron.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.neuralnetworks@1.3-service-mtk-neuron.rc \ vendor/xiaomi/rosemary/proprietary/vendor/etc/init/android.hardware.secure_element@1.2-service-mediatek.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.secure_element@1.2-service-mediatek.rc \ vendor/xiaomi/rosemary/proprietary/vendor/etc/init/camerahalserver.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/camerahalserver.rc \ - vendor/xiaomi/rosemary/proprietary/vendor/etc/init/chipinfo_init.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/chipinfo_init.rc \ vendor/xiaomi/rosemary/proprietary/vendor/etc/init/fuelgauged_init.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/fuelgauged_init.rc \ vendor/xiaomi/rosemary/proprietary/vendor/etc/init/fuelgauged_nvram_init.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/fuelgauged_nvram_init.rc \ vendor/xiaomi/rosemary/proprietary/vendor/etc/init/gsm0710muxd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/gsm0710muxd.rc \ @@ -610,6 +609,8 @@ PRODUCT_PACKAGES += \ libmtk_drvb \ vendor.mediatek.hardware.apmonitor@2.0 \ vendor.mediatek.hardware.apuware.utils@2.0 \ + vendor.mediatek.hardware.bluetooth.audio@2.1 \ + vendor.mediatek.hardware.bluetooth.audio@2.2 \ vendor.mediatek.hardware.nvram@1.0 \ vendor.mediatek.hardware.nvram@1.1 \ audio.primary.mt6785 \ @@ -1279,20 +1280,14 @@ PRODUCT_PACKAGES += \ libccci_util \ libcharon-ss \ libchromanr \ - libcodec2_hidl@1.0-v31 \ - libcodec2_hidl@1.1-v31 \ - libcodec2_hidl@1.2-v31 \ - libcodec2_hidl_plugin-v31 \ libcodec2_mtk_c2store \ libcodec2_mtk_vdec \ libcodec2_mtk_venc \ - libcodec2_soft_common-v31 \ libcodec2_soft_mtk_alacdec \ libcodec2_soft_mtk_apedec \ libcodec2_soft_mtk_imaadpcmdec \ libcodec2_soft_mtk_mp3dec \ libcodec2_soft_mtk_msadpcmdec \ - libcodec2_vndk-v31 \ libcodec2_vpp_qt_plugin \ libcodec2_vpp_rs_plugin \ libcomposer_ext \ @@ -1452,12 +1447,10 @@ PRODUCT_PACKAGES += \ librpc \ libsdk_sr \ libsensor_custom \ - libsfplugin_ccodec_utils-v31 \ libsimaka \ libsimlock \ libsimmelock \ libssl-md \ - libstagefright_bufferqueue_helper-v33 \ libstereoinfoaccessor_vsdof \ libstorage_otp \ libstrongswan \ @@ -1591,7 +1584,7 @@ PRODUCT_PACKAGES += \ lbs_hidl_service@1.0.xml \ manifest_android.hardware.drm@1.4-service.widevine.xml \ manifest_hwcomposer.xml \ - manifest_media_c2_V1_2_default.xml \ + manifest_media_c2_V1_1_default.xml \ SoterProvisioningTool \ batterysecret \ bip \ @@ -1600,7 +1593,6 @@ PRODUCT_PACKAGES += \ ccci_mdinit \ ccci_rpcd \ charon \ - chipinfo \ consumerird \ fuelgauged \ fuelgauged_nvram \