diff --git a/Android.bp b/Android.bp index 7a4641e..b4d7de6 100644 --- a/Android.bp +++ b/Android.bp @@ -19661,170 +19661,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 +19673,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 +19712,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 +19761,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 +19793,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 +19965,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 +19977,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 +20010,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 +25225,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 +25328,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 +29203,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, @@ -30008,6 +29705,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 +29713,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/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/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/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/rosemary-vendor.mk b/rosemary-vendor.mk index 9e4249e..652bcf7 100644 --- a/rosemary-vendor.mk +++ b/rosemary-vendor.mk @@ -1279,20 +1279,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 +1446,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 +1583,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 \