From b58e77eb9aba660b8daa7f5711531f44b955bc94 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mkbestas@lineageos.org>
Date: Wed, 30 Oct 2024 01:03:32 +0200
Subject: [PATCH] akita: Enable ELF checks for c2 codec libs

Change-Id: I7702c3104fde477e27a18998982605673de29aee
---
 akita/extract-files.sh             | 14 --------------
 akita/proprietary-files-vendor.txt | 24 ++++++++++++------------
 akita/setup-makefiles.sh           |  2 --
 3 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/akita/extract-files.sh b/akita/extract-files.sh
index 26d3a5f..596550c 100755
--- a/akita/extract-files.sh
+++ b/akita/extract-files.sh
@@ -100,20 +100,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/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}"
     set_module_suffix "vendor/lib64/vendor.google.whitechapel.audio.audioext@4.0.so" "-vendor" "${VENDOR_TXT}"
diff --git a/akita/proprietary-files-vendor.txt b/akita/proprietary-files-vendor.txt
index 9830201..0948f55 100644
--- a/akita/proprietary-files-vendor.txt
+++ b/akita/proprietary-files-vendor.txt
@@ -1547,18 +1547,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/akita/setup-makefiles.sh b/akita/setup-makefiles.sh
index 0a05671..6228dd5 100755
--- a/akita/setup-makefiles.sh
+++ b/akita/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
             ;;