diff --git a/Aerodactyl-vendor.mk b/Aerodactyl-vendor.mk index c7a3cf6..e6c3231 100644 --- a/Aerodactyl-vendor.mk +++ b/Aerodactyl-vendor.mk @@ -504,9 +504,15 @@ PRODUCT_PACKAGES += \ libccci_util \ libcmdl \ libcmdl_ndk.mtk.vndk \ + libcodec2_hidl@1.0-v33 \ + libcodec2_hidl@1.1-v33 \ + libcodec2_hidl@1.2-v33 \ + libcodec2_hidl_plugin-v33 \ libcodec2_mtk_c2store \ libcodec2_mtk_vdec \ libcodec2_mtk_venc \ + libcodec2_soft_common-v33 \ + libcodec2_vndk-v33 \ libcodec2_vpp_AIMEMC_plugin \ libcodec2_vpp_AISR_plugin \ libcodec2_vpp_mi_plugin \ @@ -631,9 +637,11 @@ PRODUCT_PACKAGES += \ librpc \ libscltm \ libsensor_extension \ + libsfplugin_ccodec_utils-v33 \ libsimlock \ libspeech_enh_lib \ libspeechparser_vendor \ + libstagefright_bufferqueue_helper-bp2a \ libstorage_otp \ libsysenv \ libtflite_mtk_vendor \ diff --git a/Android.bp b/Android.bp index 4abafbc..1ea5540 100644 --- a/Android.bp +++ b/Android.bp @@ -3039,6 +3039,167 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "libcodec2_hidl@1.0-v33", + owner: "nothing", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libcodec2_hidl@1.0-v33.so", + ], + shared_libs: [ + "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-v33", + "libcutils", + "libhidlbase", + "liblog", + "libstagefright_bufferpool@2.0.1", + "libui-v34", + "libutils", + "libstagefright_bufferqueue_helper-bp2a", + "libcodec2_hidl_plugin-v33", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + +cc_prebuilt_library_shared { + name: "libcodec2_hidl@1.1-v33", + owner: "nothing", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libcodec2_hidl@1.1-v33.so", + ], + shared_libs: [ + "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-v33", + "libcodec2_vndk-v33", + "libcutils", + "libhidlbase", + "liblog", + "libstagefright_bufferpool@2.0.1", + "libui-v34", + "libutils", + "libstagefright_bufferqueue_helper-bp2a", + "libcodec2_hidl_plugin-v33", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + +cc_prebuilt_library_shared { + name: "libcodec2_hidl@1.2-v33", + owner: "nothing", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libcodec2_hidl@1.2-v33.so", + ], + shared_libs: [ + "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-v33", + "libcodec2_hidl@1.1-v33", + "libcodec2_vndk-v33", + "libcutils", + "libhidlbase", + "liblog", + "libstagefright_bufferpool@2.0.1", + "libui-v34", + "libutils", + "libstagefright_bufferqueue_helper-bp2a", + "libcodec2_hidl_plugin-v33", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + +cc_prebuilt_library_shared { + name: "libcodec2_hidl_plugin-v33", + owner: "nothing", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libcodec2_hidl_plugin-v33.so", + ], + shared_libs: [ + "libbase", + "libcodec2", + "libcodec2_vndk-v33", + "liblog", + "libutils", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "libcodec2_mtk_c2store", owner: "nothing", @@ -3051,14 +3212,14 @@ cc_prebuilt_library_shared { "proprietary/vendor/lib64/libcodec2_mtk_c2store.so", ], shared_libs: [ - "libcodec2_soft_common", + "libcodec2_soft_common-v33", "libcutils", "liblog", - "libsfplugin_ccodec_utils", + "libsfplugin_ccodec_utils-v33", "libstagefright_foundation-v33", "libbase", "libcodec2", - "libcodec2_vndk", + "libcodec2_vndk-v33", "libutils", "libion", "libion_mtk", @@ -3090,21 +3251,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-v33", "libcutils", "liblog", - "libsfplugin_ccodec_utils", + "libsfplugin_ccodec_utils-v33", "libstagefright_foundation-v33", "libbase", "libcodec2", - "libcodec2_vndk", + "libcodec2_vndk-v33", "libutils", "libion", "libdmabufheap", @@ -3140,21 +3301,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-v33", "libcutils", "liblog", - "libsfplugin_ccodec_utils", + "libsfplugin_ccodec_utils-v33", "libstagefright_foundation-v33", "libbase", "libcodec2", - "libcodec2_vndk", + "libcodec2_vndk-v33", "libutils", "libion", "libdmabufheap", @@ -3172,6 +3333,78 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "libcodec2_soft_common-v33", + owner: "nothing", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libcodec2_soft_common-v33.so", + ], + shared_libs: [ + "libbase", + "libcodec2", + "libcodec2_vndk-v33", + "libutils", + "libcutils", + "liblog", + "libsfplugin_ccodec_utils-v33", + "libstagefright_foundation-v33", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + +cc_prebuilt_library_shared { + name: "libcodec2_vndk-v33", + owner: "nothing", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libcodec2_vndk-v33.so", + ], + shared_libs: [ + "android.hardware.graphics.bufferqueue@2.0", + "android.hardware.graphics.common@1.2", + "android.hardware.media.bufferpool@2.0", + "libbase", + "libcutils", + "libdmabufheap", + "libfmq", + "libgralloctypes", + "libhidlbase", + "libion", + "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_AIMEMC_plugin", owner: "nothing", @@ -3185,13 +3418,13 @@ cc_prebuilt_library_shared { ], shared_libs: [ "libcodec2", - "libcodec2_soft_common", - "libcodec2_vndk", + "libcodec2_soft_common-v33", + "libcodec2_vndk-v33", "libgralloc_extra", "libnativewindow", - "libsfplugin_ccodec_utils", + "libsfplugin_ccodec_utils-v33", "libstagefright_foundation-v33", - "libui", + "libui-v34", "libEGL", "libGLESv2", "android.hardware.graphics.allocator-V2-ndk", @@ -3238,14 +3471,14 @@ cc_prebuilt_library_shared { ], shared_libs: [ "libcodec2", - "libcodec2_soft_common", - "libcodec2_vndk", + "libcodec2_soft_common-v33", + "libcodec2_vndk-v33", "libcutils", "libgralloc_extra", "libnativewindow", - "libsfplugin_ccodec_utils", + "libsfplugin_ccodec_utils-v33", "libstagefright_foundation-v33", - "libui", + "libui-v34", "libEGL", "libGLESv2", "android.hardware.graphics.allocator-V2-ndk", @@ -3290,11 +3523,11 @@ cc_prebuilt_library_shared { "proprietary/vendor/lib64/libcodec2_vpp_mi_plugin.so", ], shared_libs: [ - "libcodec2_soft_common", - "libsfplugin_ccodec_utils", + "libcodec2_soft_common-v33", + "libsfplugin_ccodec_utils-v33", "libstagefright_foundation-v33", "libcodec2", - "libcodec2_vndk", + "libcodec2_vndk-v33", "liblog", "libbase", "libutils", @@ -3323,11 +3556,11 @@ cc_prebuilt_library_shared { "proprietary/vendor/lib64/libcodec2_vpp_qt_plugin.so", ], shared_libs: [ - "libcodec2_soft_common", - "libsfplugin_ccodec_utils", + "libcodec2_soft_common-v33", + "libsfplugin_ccodec_utils-v33", "libstagefright_foundation-v33", "libcodec2", - "libcodec2_vndk", + "libcodec2_vndk-v33", "liblog", "libbase", "libutils", @@ -3356,11 +3589,11 @@ cc_prebuilt_library_shared { "proprietary/vendor/lib64/libcodec2_vpp_rs_plugin.so", ], shared_libs: [ - "libcodec2_soft_common", - "libsfplugin_ccodec_utils", + "libcodec2_soft_common-v33", + "libsfplugin_ccodec_utils-v33", "libstagefright_foundation-v33", "libcodec2", - "libcodec2_vndk", + "libcodec2_vndk-v33", "liblog", "libbase", "libutils", @@ -6749,6 +6982,38 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "libsfplugin_ccodec_utils-v33", + owner: "nothing", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libsfplugin_ccodec_utils-v33.so", + ], + shared_libs: [ + "libbase", + "libcodec2", + "libcodec2_vndk-v33", + "libcutils", + "liblog", + "libnativewindow", + "libstagefright_foundation-v33", + "libutils", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "libsimlock", owner: "nothing", @@ -6830,6 +7095,41 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "libstagefright_bufferqueue_helper-bp2a", + owner: "nothing", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libstagefright_bufferqueue_helper-bp2a.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: "libstorage_otp", owner: "nothing", @@ -24492,10 +24792,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-v33", + "libcodec2_hidl@1.1-v33", + "libcodec2_hidl@1.2-v33", + "libcodec2_vndk-v33", "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 6f2803c..c66a165 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/libcodec2_hidl@1.0-v33.so b/proprietary/vendor/lib64/libcodec2_hidl@1.0-v33.so new file mode 100644 index 0000000..30ad757 Binary files /dev/null and b/proprietary/vendor/lib64/libcodec2_hidl@1.0-v33.so differ diff --git a/proprietary/vendor/lib64/libcodec2_hidl@1.1-v33.so b/proprietary/vendor/lib64/libcodec2_hidl@1.1-v33.so new file mode 100644 index 0000000..2a14d84 Binary files /dev/null and b/proprietary/vendor/lib64/libcodec2_hidl@1.1-v33.so differ diff --git a/proprietary/vendor/lib64/libcodec2_hidl@1.2-v33.so b/proprietary/vendor/lib64/libcodec2_hidl@1.2-v33.so new file mode 100644 index 0000000..35355f5 Binary files /dev/null and b/proprietary/vendor/lib64/libcodec2_hidl@1.2-v33.so differ diff --git a/proprietary/vendor/lib64/libcodec2_hidl_plugin-v33.so b/proprietary/vendor/lib64/libcodec2_hidl_plugin-v33.so new file mode 100644 index 0000000..5bf3bd0 Binary files /dev/null and b/proprietary/vendor/lib64/libcodec2_hidl_plugin-v33.so differ diff --git a/proprietary/vendor/lib64/libcodec2_mtk_c2store.so b/proprietary/vendor/lib64/libcodec2_mtk_c2store.so index 715c6cf..a6eb811 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 7876401..f81e181 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 d46c73f..5497994 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-v33.so b/proprietary/vendor/lib64/libcodec2_soft_common-v33.so new file mode 100644 index 0000000..e98a538 Binary files /dev/null and b/proprietary/vendor/lib64/libcodec2_soft_common-v33.so differ diff --git a/proprietary/vendor/lib64/libcodec2_vndk-v33.so b/proprietary/vendor/lib64/libcodec2_vndk-v33.so new file mode 100644 index 0000000..4c765e3 Binary files /dev/null and b/proprietary/vendor/lib64/libcodec2_vndk-v33.so differ diff --git a/proprietary/vendor/lib64/libcodec2_vpp_AIMEMC_plugin.so b/proprietary/vendor/lib64/libcodec2_vpp_AIMEMC_plugin.so index df3ee92..1c524e1 100644 Binary files a/proprietary/vendor/lib64/libcodec2_vpp_AIMEMC_plugin.so and b/proprietary/vendor/lib64/libcodec2_vpp_AIMEMC_plugin.so differ diff --git a/proprietary/vendor/lib64/libcodec2_vpp_AISR_plugin.so b/proprietary/vendor/lib64/libcodec2_vpp_AISR_plugin.so index 42e6cd1..5bda53d 100644 Binary files a/proprietary/vendor/lib64/libcodec2_vpp_AISR_plugin.so and b/proprietary/vendor/lib64/libcodec2_vpp_AISR_plugin.so differ diff --git a/proprietary/vendor/lib64/libcodec2_vpp_mi_plugin.so b/proprietary/vendor/lib64/libcodec2_vpp_mi_plugin.so index 6c3851a..fcfb710 100644 Binary files a/proprietary/vendor/lib64/libcodec2_vpp_mi_plugin.so and b/proprietary/vendor/lib64/libcodec2_vpp_mi_plugin.so differ diff --git a/proprietary/vendor/lib64/libcodec2_vpp_qt_plugin.so b/proprietary/vendor/lib64/libcodec2_vpp_qt_plugin.so index a106d3f..d353b0a 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 672edc4..ac6b7db 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-v33.so b/proprietary/vendor/lib64/libsfplugin_ccodec_utils-v33.so new file mode 100644 index 0000000..8920e1c Binary files /dev/null and b/proprietary/vendor/lib64/libsfplugin_ccodec_utils-v33.so differ diff --git a/proprietary/vendor/lib64/libstagefright_bufferqueue_helper-bp2a.so b/proprietary/vendor/lib64/libstagefright_bufferqueue_helper-bp2a.so new file mode 100644 index 0000000..2b44c98 Binary files /dev/null and b/proprietary/vendor/lib64/libstagefright_bufferqueue_helper-bp2a.so differ