Browse Source

lynx: Enable ELF checks for c2 codec libs

Change-Id: I7702c3104fde477e27a18998982605673de29aee
Michael Bestas 4 tháng trước cách đây
mục cha
commit
47b30e7b1f
3 tập tin đã thay đổi với 25 bổ sung52 xóa
  1. 0 25
      lynx/extract-files.sh
  2. 24 24
      lynx/proprietary-files-vendor.txt
  3. 1 3
      lynx/setup-makefiles.sh

+ 0 - 25
lynx/extract-files.sh

@@ -101,35 +101,10 @@ 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
     # lowi-server depends on libwpa_client, which is a gnu makefile target
     set_disable_checkelf "vendor/bin/lowi-server" "${VENDOR_TXT}"
-    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}"

+ 24 - 24
lynx/proprietary-files-vendor.txt

@@ -1489,18 +1489,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
@@ -1604,18 +1604,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

+ 1 - 3
lynx/setup-makefiles.sh

@@ -51,9 +51,7 @@ function lib_to_package_fixup_vendor_variants() {
         libprotobuf-cpp-lite-21.12)
             echo "libprotobuf-cpp-lite"
             ;;
-        libacryl | \
-            libexynosv4l2 | \
-            libwpa_client) ;;
+        libwpa_client) ;;
         *)
             return 1
             ;;