From 6a0b35ef13f92038ff959f2e036c3a38c23145b4 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Wed, 30 Oct 2024 01:03:32 +0200 Subject: [PATCH] bluejay: Enable ELF checks for c2 codec libs Change-Id: I7702c3104fde477e27a18998982605673de29aee --- bluejay/extract-files.sh | 25 --------------- bluejay/proprietary-files-vendor.txt | 48 ++++++++++++++-------------- bluejay/setup-makefiles.sh | 2 -- 3 files changed, 24 insertions(+), 51 deletions(-) diff --git a/bluejay/extract-files.sh b/bluejay/extract-files.sh index 3e09d29..e8a89a7 100755 --- a/bluejay/extract-files.sh +++ b/bluejay/extract-files.sh @@ -101,33 +101,8 @@ if [ -z "${ONLY_FIRMWARE}" ]; then generate_prop_list_from_image "vendor.img" "${VENDOR_TXT}" VENDOR_SKIP_FILES # flp.default & gps.default have incorrect SONAME - # 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/hw/flp.default.so" "${VENDOR_TXT}" set_disable_checkelf "vendor/lib64/hw/gps.default.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}" diff --git a/bluejay/proprietary-files-vendor.txt b/bluejay/proprietary-files-vendor.txt index f78fd0d..9de6889 100644 --- a/bluejay/proprietary-files-vendor.txt +++ b/bluejay/proprietary-files-vendor.txt @@ -1172,18 +1172,18 @@ vendor/lib/hw/vulkan.mali.so vendor/lib/lassen_dmd_constants.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 @@ -1277,18 +1277,18 @@ vendor/lib64/hw/vulkan.mali.so vendor/lib64/lassen_dmd_constants.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/bluejay/setup-makefiles.sh b/bluejay/setup-makefiles.sh index 72337ad..2cfec13 100755 --- a/bluejay/setup-makefiles.sh +++ b/bluejay/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 ;;