From cc44c3f21d75fb9d676c1e65c39e6ded2b439567 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Wed, 30 Oct 2024 01:03:32 +0200 Subject: [PATCH] tangorpro: Enable ELF checks for c2 codec libs Change-Id: I7702c3104fde477e27a18998982605673de29aee --- tangorpro/extract-files.sh | 26 -------------- tangorpro/proprietary-files-vendor.txt | 48 +++++++++++++------------- tangorpro/setup-makefiles.sh | 2 -- 3 files changed, 24 insertions(+), 52 deletions(-) diff --git a/tangorpro/extract-files.sh b/tangorpro/extract-files.sh index 4fc6afb..f9096d7 100755 --- a/tangorpro/extract-files.sh +++ b/tangorpro/extract-files.sh @@ -74,32 +74,6 @@ if [ -z "${ONLY_FIRMWARE}" ]; then VENDOR_TXT="${MY_DIR}/proprietary-files-vendor.txt" generate_prop_list_from_image "vendor.img" "${VENDOR_TXT}" VENDOR_SKIP_FILES - # libExynosC2*Dec & libExynosC2*Enc depend on libacryl & libexynosv4l2, which are gnu makefile targets - set_disable_checkelf "vendor/lib/libExynosC2H263Dec.so" "${VENDOR_TXT}" - set_disable_checkelf "vendor/lib/libExynosC2H263Enc.so" "${VENDOR_TXT}" - set_disable_checkelf "vendor/lib/libExynosC2H264Dec.so" "${VENDOR_TXT}" - set_disable_checkelf "vendor/lib/libExynosC2H264Enc.so" "${VENDOR_TXT}" - set_disable_checkelf "vendor/lib/libExynosC2HevcDec.so" "${VENDOR_TXT}" - set_disable_checkelf "vendor/lib/libExynosC2HevcEnc.so" "${VENDOR_TXT}" - set_disable_checkelf "vendor/lib/libExynosC2Mpeg4Dec.so" "${VENDOR_TXT}" - set_disable_checkelf "vendor/lib/libExynosC2Mpeg4Enc.so" "${VENDOR_TXT}" - set_disable_checkelf "vendor/lib/libExynosC2Vp8Dec.so" "${VENDOR_TXT}" - set_disable_checkelf "vendor/lib/libExynosC2Vp8Enc.so" "${VENDOR_TXT}" - set_disable_checkelf "vendor/lib/libExynosC2Vp9Dec.so" "${VENDOR_TXT}" - set_disable_checkelf "vendor/lib/libExynosC2Vp9Enc.so" "${VENDOR_TXT}" - set_disable_checkelf "vendor/lib64/libExynosC2H263Dec.so" "${VENDOR_TXT}" - set_disable_checkelf "vendor/lib64/libExynosC2H263Enc.so" "${VENDOR_TXT}" - set_disable_checkelf "vendor/lib64/libExynosC2H264Dec.so" "${VENDOR_TXT}" - set_disable_checkelf "vendor/lib64/libExynosC2H264Enc.so" "${VENDOR_TXT}" - set_disable_checkelf "vendor/lib64/libExynosC2HevcDec.so" "${VENDOR_TXT}" - set_disable_checkelf "vendor/lib64/libExynosC2HevcEnc.so" "${VENDOR_TXT}" - set_disable_checkelf "vendor/lib64/libExynosC2Mpeg4Dec.so" "${VENDOR_TXT}" - set_disable_checkelf "vendor/lib64/libExynosC2Mpeg4Enc.so" "${VENDOR_TXT}" - set_disable_checkelf "vendor/lib64/libExynosC2Vp8Dec.so" "${VENDOR_TXT}" - set_disable_checkelf "vendor/lib64/libExynosC2Vp8Enc.so" "${VENDOR_TXT}" - set_disable_checkelf "vendor/lib64/libExynosC2Vp9Dec.so" "${VENDOR_TXT}" - set_disable_checkelf "vendor/lib64/libExynosC2Vp9Enc.so" "${VENDOR_TXT}" - set_module_suffix "vendor/lib/com.google.edgetpu_app_service-V3-ndk.so" "-vendor" "${VENDOR_TXT}" set_module_suffix "vendor/lib64/com.google.edgetpu_app_service-V3-ndk.so" "-vendor" "${VENDOR_TXT}" set_module_suffix "vendor/lib64/com.google.edgetpu_vendor_service-V2-ndk.so" "-vendor" "${VENDOR_TXT}" diff --git a/tangorpro/proprietary-files-vendor.txt b/tangorpro/proprietary-files-vendor.txt index 78b0685..b775197 100644 --- a/tangorpro/proprietary-files-vendor.txt +++ b/tangorpro/proprietary-files-vendor.txt @@ -223,18 +223,18 @@ vendor/lib/hw/vendor.google.whitechapel.audio.audioext@4.0-impl.so vendor/lib/hw/vulkan.mali.so vendor/lib/libAlgFx_HiFi3z.so vendor/lib/libExynosC2ComponentStore.so -vendor/lib/libExynosC2H263Dec.so;DISABLE_CHECKELF -vendor/lib/libExynosC2H263Enc.so;DISABLE_CHECKELF -vendor/lib/libExynosC2H264Dec.so;DISABLE_CHECKELF -vendor/lib/libExynosC2H264Enc.so;DISABLE_CHECKELF -vendor/lib/libExynosC2HevcDec.so;DISABLE_CHECKELF -vendor/lib/libExynosC2HevcEnc.so;DISABLE_CHECKELF -vendor/lib/libExynosC2Mpeg4Dec.so;DISABLE_CHECKELF -vendor/lib/libExynosC2Mpeg4Enc.so;DISABLE_CHECKELF -vendor/lib/libExynosC2Vp8Dec.so;DISABLE_CHECKELF -vendor/lib/libExynosC2Vp8Enc.so;DISABLE_CHECKELF -vendor/lib/libExynosC2Vp9Dec.so;DISABLE_CHECKELF -vendor/lib/libExynosC2Vp9Enc.so;DISABLE_CHECKELF +vendor/lib/libExynosC2H263Dec.so +vendor/lib/libExynosC2H263Enc.so +vendor/lib/libExynosC2H264Dec.so +vendor/lib/libExynosC2H264Enc.so +vendor/lib/libExynosC2HevcDec.so +vendor/lib/libExynosC2HevcEnc.so +vendor/lib/libExynosC2Mpeg4Dec.so +vendor/lib/libExynosC2Mpeg4Enc.so +vendor/lib/libExynosC2Vp8Dec.so +vendor/lib/libExynosC2Vp8Enc.so +vendor/lib/libExynosC2Vp9Dec.so +vendor/lib/libExynosC2Vp9Enc.so vendor/lib/libOpenCL-pixel.so vendor/lib/libOpenCL.so vendor/lib/lib_aion_buffer.so @@ -320,18 +320,18 @@ vendor/lib64/hw/vendor.google.whitechapel.audio.audioext@4.0-impl.so vendor/lib64/hw/vulkan.mali.so vendor/lib64/libAlgFx_HiFi3z.so vendor/lib64/libExynosC2ComponentStore.so -vendor/lib64/libExynosC2H263Dec.so;DISABLE_CHECKELF -vendor/lib64/libExynosC2H263Enc.so;DISABLE_CHECKELF -vendor/lib64/libExynosC2H264Dec.so;DISABLE_CHECKELF -vendor/lib64/libExynosC2H264Enc.so;DISABLE_CHECKELF -vendor/lib64/libExynosC2HevcDec.so;DISABLE_CHECKELF -vendor/lib64/libExynosC2HevcEnc.so;DISABLE_CHECKELF -vendor/lib64/libExynosC2Mpeg4Dec.so;DISABLE_CHECKELF -vendor/lib64/libExynosC2Mpeg4Enc.so;DISABLE_CHECKELF -vendor/lib64/libExynosC2Vp8Dec.so;DISABLE_CHECKELF -vendor/lib64/libExynosC2Vp8Enc.so;DISABLE_CHECKELF -vendor/lib64/libExynosC2Vp9Dec.so;DISABLE_CHECKELF -vendor/lib64/libExynosC2Vp9Enc.so;DISABLE_CHECKELF +vendor/lib64/libExynosC2H263Dec.so +vendor/lib64/libExynosC2H263Enc.so +vendor/lib64/libExynosC2H264Dec.so +vendor/lib64/libExynosC2H264Enc.so +vendor/lib64/libExynosC2HevcDec.so +vendor/lib64/libExynosC2HevcEnc.so +vendor/lib64/libExynosC2Mpeg4Dec.so +vendor/lib64/libExynosC2Mpeg4Enc.so +vendor/lib64/libExynosC2Vp8Dec.so +vendor/lib64/libExynosC2Vp8Enc.so +vendor/lib64/libExynosC2Vp9Dec.so +vendor/lib64/libExynosC2Vp9Enc.so vendor/lib64/libOpenCL-pixel.so vendor/lib64/libOpenCL.so vendor/lib64/lib_aion_buffer.so diff --git a/tangorpro/setup-makefiles.sh b/tangorpro/setup-makefiles.sh index 21f6a79..46fc0c5 100755 --- a/tangorpro/setup-makefiles.sh +++ b/tangorpro/setup-makefiles.sh @@ -50,8 +50,6 @@ function lib_to_package_fixup_vendor_variants() { libprotobuf-cpp-lite-21.12) echo "libprotobuf-cpp-lite" ;; - libacryl | \ - libexynosv4l2) ;; *) return 1 ;;