diff --git a/husky/extract-files.sh b/husky/extract-files.sh index 577895d..f0bd25b 100755 --- a/husky/extract-files.sh +++ b/husky/extract-files.sh @@ -101,21 +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/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/lib64/com.google.edgetpu_app_service-V4-ndk.so" "-vendor" "${VENDOR_TXT}" set_module_suffix "vendor/lib64/com.google.edgetpu_vendor_service-V2-ndk.so" "-vendor" "${VENDOR_TXT}" diff --git a/husky/proprietary-files-vendor.txt b/husky/proprietary-files-vendor.txt index 02eb6bb..696a660 100644 --- a/husky/proprietary-files-vendor.txt +++ b/husky/proprietary-files-vendor.txt @@ -1557,18 +1557,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/husky/setup-makefiles.sh b/husky/setup-makefiles.sh index 79130ba..0a6e119 100755 --- a/husky/setup-makefiles.sh +++ b/husky/setup-makefiles.sh @@ -52,8 +52,6 @@ function lib_to_package_fixup_vendor_variants() { libprotobuf-cpp-lite-21.12) echo "libprotobuf-cpp-lite" ;; - libacryl | \ - libexynosv4l2) ;; *) return 1 ;; diff --git a/shiba/extract-files.sh b/shiba/extract-files.sh index 4ed783c..6b20f7f 100755 --- a/shiba/extract-files.sh +++ b/shiba/extract-files.sh @@ -101,21 +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/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/lib64/com.google.edgetpu_app_service-V4-ndk.so" "-vendor" "${VENDOR_TXT}" set_module_suffix "vendor/lib64/com.google.edgetpu_vendor_service-V2-ndk.so" "-vendor" "${VENDOR_TXT}" diff --git a/shiba/proprietary-files-vendor.txt b/shiba/proprietary-files-vendor.txt index 4190387..b240ad0 100644 --- a/shiba/proprietary-files-vendor.txt +++ b/shiba/proprietary-files-vendor.txt @@ -1554,18 +1554,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/shiba/setup-makefiles.sh b/shiba/setup-makefiles.sh index 9496aeb..53d75a8 100755 --- a/shiba/setup-makefiles.sh +++ b/shiba/setup-makefiles.sh @@ -52,8 +52,6 @@ function lib_to_package_fixup_vendor_variants() { libprotobuf-cpp-lite-21.12) echo "libprotobuf-cpp-lite" ;; - libacryl | \ - libexynosv4l2) ;; *) return 1 ;;