From 1e0e035f441bc5fad01391c05258b9b719fd2b4d Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Sat, 19 Oct 2024 19:22:22 +0200 Subject: [PATCH] lemonadep: Setup ELF checks Change-Id: Iacc8a942f4e09bf61f5b8e0f4ad8e70f0b43dfa8 --- extract-files.py | 15 +++++++++++++++ proprietary-files.txt | 28 ++++++++++++++-------------- 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/extract-files.py b/extract-files.py index 739acbd..adf9e3a 100755 --- a/extract-files.py +++ b/extract-files.py @@ -8,20 +8,33 @@ from extract_utils.fixups_blob import ( blob_fixup, blob_fixups_user_type, ) +from extract_utils.fixups_lib import ( + lib_fixup_vendorcompat, + lib_fixups_user_type, + libs_proto_3_9_1, +) from extract_utils.main import ( ExtractUtils, ExtractUtilsModule, ) namespace_imports = [ + 'hardware/oplus', 'vendor/oneplus/sm8350-common', + 'vendor/qcom/opensource/display', ] +lib_fixups: lib_fixups_user_type = { + libs_proto_3_9_1: lib_fixup_vendorcompat, +} + blob_fixups: blob_fixups_user_type = { 'odm/etc/camera/CameraHWConfiguration.config': blob_fixup() .regex_replace('SystemCamera = 0; 0; 1; 1; 1; 1', 'SystemCamera = 0; 0; 0; 0; 0; 1'), ('odm/lib/liblvimfs_wrapper.so', 'odm/lib64/libCOppLceTonemapAPI.so', 'odm/lib64/libaps_frame_registration.so', 'vendor/lib64/libalsc.so'): blob_fixup() .replace_needed('libstdc++.so', 'libstdc++_vendor.so'), + 'odm/lib64/libAlgoProcess.so': blob_fixup() + .replace_needed('android.hardware.graphics.common-V1-ndk_platform.so', 'android.hardware.graphics.common-V5-ndk.so'), 'vendor/etc/libnfc-nci.conf': blob_fixup() .regex_replace('NFC_DEBUG_ENABLED=1', 'NFC_DEBUG_ENABLED=0'), 'vendor/etc/libnfc-nxp.conf': blob_fixup() @@ -41,6 +54,8 @@ module = ExtractUtilsModule( 'oneplus', namespace_imports=namespace_imports, blob_fixups=blob_fixups, + lib_fixups=lib_fixups, + check_elf=True, add_firmware_proprietary_file=True, ) diff --git a/proprietary-files.txt b/proprietary-files.txt index b1fcf0b..a71477f 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -12,11 +12,11 @@ odm/etc/acdbdata/Headset_cal.acdb odm/etc/acdbdata/Speaker_cal.acdb # ADSP modules -odm/lib/rfsa/adsp/aiboost/libQnnHtpAltPrepSkel.so -odm/lib/rfsa/adsp/aiboost/libQnnHtpSkel.so +odm/lib/rfsa/adsp/aiboost/libQnnHtpAltPrepSkel.so;MODULE_SUFFIX=_odm_aiboost +odm/lib/rfsa/adsp/aiboost/libQnnHtpSkel.so;MODULE_SUFFIX=_odm_aiboost odm/lib/rfsa/adsp/aiboost/libaiboostubwc_skel.so odm/lib/rfsa/adsp/libQnnHtp.so -odm/lib/rfsa/adsp/libQnnHtpAltPrepSkel.so +odm/lib/rfsa/adsp/libQnnHtpAltPrepSkel.so;MODULE_SUFFIX=_odm odm/lib/rfsa/adsp/libQnnHtpSkel.so odm/lib/rfsa/adsp/libSuperRawPost_skel.so odm/lib/rfsa/adsp/libVDHexagonBlurless_v2_skel.so @@ -35,7 +35,7 @@ odm/lib/rfsa/adsp/libc++abi.so.1 odm/lib/rfsa/adsp/libcalculator_domains_skel.so odm/lib/rfsa/adsp/libcalculator_skel.so odm/lib/rfsa/adsp/libdehaze_skel.so -odm/lib/rfsa/adsp/libhdr_skel.so +odm/lib/rfsa/adsp/libhdr_skel.so;MODULE_SUFFIX=_odm odm/lib/rfsa/adsp/libhvxFaceBeautyPre_skel.so odm/lib/rfsa/adsp/libinterstellar_skel.so odm/lib/rfsa/adsp/libktvdrc.so @@ -57,15 +57,15 @@ odm/lib/rfsa/adsp/libsnpe_htp_v68_skel.so odm/lib/rfsa/adsp/libvdblurless_4.6.10L_skel.so odm/lib/rfsa/adsp/libvdblurless_skel.so odm/lib/rfsa/adsp/libvdsuperphoto_skel.so -odm/lib/rfsa/adsp/libworker_pool.so +odm/lib/rfsa/adsp/libworker_pool.so;MODULE_SUFFIX=_odm # Audio odm/lib/libaudioEngineerTest.so odm/lib/liblvimfs.so odm/lib/liblvimfs_wrapper.so vendor/lib/hw/audio.primary.lahaina.so -vendor/lib/liba2dpoffload.so:odm/lib/liba2dpoffload.so -vendor/lib/libssrec.so:odm/lib/libssrec.so +vendor/lib/liba2dpoffload.so:odm/lib/liba2dpoffload.so;MODULE_SUFFIX=_odm +vendor/lib/libssrec.so:odm/lib/libssrec.so;MODULE_SUFFIX=_odm vendor/lib/libextcamera_client.so vendor/lib/libgui1_vendor.so vendor/lib/vendor.oplus.hardware.extcamera@1.0.so @@ -536,7 +536,7 @@ odm/etc/init/calibrationOutput_uw_686.rc odm/etc/init/calibrationOutput_wt.rc odm/etc/vintf/manifest/manifest_oplus_cameraextension_aidl.xml odm/lib/libDeVIS.so -odm/lib/libdehaze.so +odm/lib/libdehaze.so;DISABLE_CHECKELF odm/lib/libfastov_dsp.so odm/lib/libnightvision.so;FIX_SONAME odm/lib64/camera/components/com.arcsoft.node.eisv2.so @@ -582,7 +582,7 @@ odm/lib64/libFaceBeautyPICap.so odm/lib64/libFaceBeautyPre.so odm/lib64/libFaceDistortionCorrection.so odm/lib64/libImageWarpMask.so;FIX_SONAME -odm/lib64/libOGLManager.so +odm/lib64/libOGLManager.so;DISABLE_CHECKELF odm/lib64/libOPLUS_SCPortrait.so;FIX_SONAME odm/lib64/libPerfectlyClearCrux.so odm/lib64/libPerfectlyClearCruxOpt.so @@ -622,22 +622,22 @@ odm/lib64/libarcsoft_hdr_couple_api.so odm/lib64/libarcsoft_hdr_couple_api_v4.so odm/lib64/libarcsoft_hdr_denoise_api.so odm/lib64/libarcsoft_hdr_denoise_api_v4.so -odm/lib64/libarcsoft_hdrplus_hvx_stub.so +odm/lib64/libarcsoft_hdrplus_hvx_stub.so;DISABLE_CHECKELF odm/lib64/libarcsoft_high_dynamic_range.so odm/lib64/libarcsoft_high_dynamic_range_couple.so odm/lib64/libarcsoft_high_dynamic_range_couple_v4.so -odm/lib64/libarcsoft_high_dynamic_range_v4.so +odm/lib64/libarcsoft_high_dynamic_range_v4.so;DISABLE_CHECKELF odm/lib64/libarcsoft_lensstaindetection.so odm/lib64/libarcsoft_low_light_hdr.so odm/lib64/libarcsoft_pic_best.so odm/lib64/libarcsoft_portraitSN_hvx_stub.so -odm/lib64/libarcsoft_portrait_super_night_raw.so +odm/lib64/libarcsoft_portrait_super_night_raw.so;DISABLE_CHECKELF odm/lib64/libarcsoft_preview_antibanding.so odm/lib64/libarcsoft_qnnhtp.so odm/lib64/libarcsoft_scbokeh_video.so odm/lib64/libarcsoft_smart_denoise.so odm/lib64/libarcsoft_smart_denoise_v4.so -odm/lib64/libarcsoft_super_night_raw.so +odm/lib64/libarcsoft_super_night_raw.so;DISABLE_CHECKELF odm/lib64/libarcsoft_tricam_calibration.so odm/lib64/libarcsoft_tricam_verification.so odm/lib64/libarcsoft_triple_sat.so @@ -649,7 +649,7 @@ odm/lib64/libdualcam_optical_zoom_control.so odm/lib64/libdualcam_video_optical_zoom.so odm/lib64/libfastov_dsp.so odm/lib64/libhta.so -odm/lib64/libhwconfigurationutil.so +odm/lib64/libhwconfigurationutil.so;MODULE_SUFFIX=_odm odm/lib64/libhyperlapse.so odm/lib64/libml_util.so odm/lib64/libmpbase.so