diff --git a/Android.bp b/Android.bp index 794e5fe..8ee0510 100644 --- a/Android.bp +++ b/Android.bp @@ -4999,7 +4999,7 @@ cc_prebuilt_library_shared { "libcutils", "libutils", "libhardware", - "libstagefright_foundation-v33", + "libstagefright_foundation", "libksensor", "libaedv", "libc++", @@ -19787,6 +19787,170 @@ 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", @@ -19799,14 +19963,14 @@ cc_prebuilt_library_shared { "proprietary/vendor/lib64/libcodec2_mtk_c2store.so", ], shared_libs: [ - "libcodec2_soft_common", + "libcodec2_soft_common-v31", "libcutils", "liblog", - "libsfplugin_ccodec_utils", + "libsfplugin_ccodec_utils-v31", "libstagefright_foundation-v33", "libbase", "libcodec2", - "libcodec2_vndk", + "libcodec2_vndk-v31", "libutils", "libion", "libion_mtk", @@ -19838,21 +20002,21 @@ cc_prebuilt_library_shared { "libformatter", "libdpframework", "android.hardware.graphics.bufferqueue@2.0", - "libui", + "libui-v34", "libgralloc_extra", "libexpat", "libsync", "libhidlbase", "libhwbinder", "libged", - "libcodec2_soft_common", + "libcodec2_soft_common-v31", "libcutils", "liblog", - "libsfplugin_ccodec_utils", + "libsfplugin_ccodec_utils-v31", "libstagefright_foundation-v33", "libbase", "libcodec2", - "libcodec2_vndk", + "libcodec2_vndk-v31", "libutils", "libion", "libdmabufheap", @@ -19887,21 +20051,21 @@ cc_prebuilt_library_shared { "libformatter", "libdpframework", "android.hardware.graphics.bufferqueue@2.0", - "libui", + "libui-v34", "libgralloc_extra", "libexpat", "libsync", "libhidlbase", "libhwbinder", "libged", - "libcodec2_soft_common", + "libcodec2_soft_common-v31", "libcutils", "liblog", - "libsfplugin_ccodec_utils", + "libsfplugin_ccodec_utils-v31", "libstagefright_foundation-v33", "libbase", "libcodec2", - "libcodec2_vndk", + "libcodec2_vndk-v31", "libutils", "libion", "libdmabufheap", @@ -19919,6 +20083,38 @@ 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", @@ -20091,6 +20287,46 @@ 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", @@ -20103,11 +20339,11 @@ cc_prebuilt_library_shared { "proprietary/vendor/lib64/libcodec2_vpp_qt_plugin.so", ], shared_libs: [ - "libcodec2_soft_common", - "libsfplugin_ccodec_utils", + "libcodec2_soft_common-v31", + "libsfplugin_ccodec_utils-v31", "libstagefright_foundation-v33", "libcodec2", - "libcodec2_vndk", + "libcodec2_vndk-v31", "liblog", "libbase", "libutils", @@ -20136,11 +20372,11 @@ cc_prebuilt_library_shared { "proprietary/vendor/lib64/libcodec2_vpp_rs_plugin.so", ], shared_libs: [ - "libcodec2_soft_common", - "libsfplugin_ccodec_utils", + "libcodec2_soft_common-v31", + "libsfplugin_ccodec_utils-v31", "libstagefright_foundation-v33", "libcodec2", - "libcodec2_vndk", + "libcodec2_vndk-v31", "liblog", "libbase", "libutils", @@ -25350,6 +25586,38 @@ 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", @@ -25453,6 +25721,41 @@ 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", @@ -29842,10 +30145,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", - "libcodec2_hidl@1.1", - "libcodec2_hidl@1.2", - "libcodec2_vndk", + "libcodec2_hidl@1.0-v31", + "libcodec2_hidl@1.1-v31", + "libcodec2_hidl@1.2-v31", + "libcodec2_vndk-v31", "libhidlbase", "libavservices_minijail", "libbinder", 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 115f32d..b03b586 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/lib64/hw/sensors.mt6785.so b/proprietary/vendor/lib64/hw/sensors.mt6785.so index f96d6c0..e91c508 100644 Binary files a/proprietary/vendor/lib64/hw/sensors.mt6785.so and b/proprietary/vendor/lib64/hw/sensors.mt6785.so differ diff --git a/proprietary/vendor/lib64/libcodec2_hidl@1.0-v31.so b/proprietary/vendor/lib64/libcodec2_hidl@1.0-v31.so new file mode 100644 index 0000000..b3599a2 Binary files /dev/null and b/proprietary/vendor/lib64/libcodec2_hidl@1.0-v31.so differ diff --git a/proprietary/vendor/lib64/libcodec2_hidl@1.1-v31.so b/proprietary/vendor/lib64/libcodec2_hidl@1.1-v31.so new file mode 100644 index 0000000..45ec8d5 Binary files /dev/null and b/proprietary/vendor/lib64/libcodec2_hidl@1.1-v31.so differ diff --git a/proprietary/vendor/lib64/libcodec2_hidl@1.2-v31.so b/proprietary/vendor/lib64/libcodec2_hidl@1.2-v31.so new file mode 100644 index 0000000..0f4a14c Binary files /dev/null and b/proprietary/vendor/lib64/libcodec2_hidl@1.2-v31.so differ diff --git a/proprietary/vendor/lib64/libcodec2_hidl_plugin-v31.so b/proprietary/vendor/lib64/libcodec2_hidl_plugin-v31.so new file mode 100644 index 0000000..d5e84c6 Binary files /dev/null and b/proprietary/vendor/lib64/libcodec2_hidl_plugin-v31.so differ diff --git a/proprietary/vendor/lib64/libcodec2_mtk_c2store.so b/proprietary/vendor/lib64/libcodec2_mtk_c2store.so index e8e3993..c687812 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 8e0e6a4..6fc150a 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 901e279..a56787f 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 new file mode 100644 index 0000000..5d0adcc Binary files /dev/null and b/proprietary/vendor/lib64/libcodec2_soft_common-v31.so differ diff --git a/proprietary/vendor/lib64/libcodec2_vndk-v31.so b/proprietary/vendor/lib64/libcodec2_vndk-v31.so new file mode 100644 index 0000000..248f799 Binary files /dev/null and b/proprietary/vendor/lib64/libcodec2_vndk-v31.so differ diff --git a/proprietary/vendor/lib64/libcodec2_vpp_qt_plugin.so b/proprietary/vendor/lib64/libcodec2_vpp_qt_plugin.so index 119e07d..1e580cc 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 e23049d..b259905 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 new file mode 100644 index 0000000..ebb7666 Binary files /dev/null and b/proprietary/vendor/lib64/libsfplugin_ccodec_utils-v31.so differ diff --git a/proprietary/vendor/lib64/libstagefright_bufferqueue_helper-v33.so b/proprietary/vendor/lib64/libstagefright_bufferqueue_helper-v33.so new file mode 100644 index 0000000..caa5644 Binary files /dev/null and b/proprietary/vendor/lib64/libstagefright_bufferqueue_helper-v33.so differ diff --git a/rosemary-vendor.mk b/rosemary-vendor.mk index 62396f4..67ff237 100644 --- a/rosemary-vendor.mk +++ b/rosemary-vendor.mk @@ -1282,14 +1282,20 @@ 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 \ @@ -1449,10 +1455,12 @@ 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 \