From b412745ab64130f4c0da539a3208f622289f02f5 Mon Sep 17 00:00:00 2001 From: David Wronek Date: Fri, 27 Dec 2024 13:09:51 +0100 Subject: [PATCH] e3q: Clean up extract-files.py a little Change-Id: Ia425ac768bff31bf1e9eab06ea878da6f6157de2 --- BoardConfig.mk | 4 ++++ extract-files.py | 7 ++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/BoardConfig.mk b/BoardConfig.mk index 8783f8b..ca1cef3 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -206,6 +206,10 @@ TARGET_ODM_PROP += $(DEVICE_PATH)/odm.prop TARGET_ODM_DLKM_PROP += $(DEVICE_PATH)/odm_dlkm.prop TARGET_VENDOR_DLKM_PROP += $(DEVICE_PATH)/vendor_dlkm.prop +# RIL +ENABLE_VENDOR_RIL_SERVICE := true +# TODO: SOONG_CONFIG_rfs_mpss_firmware_symlink_target := firmware_modem + # Recovery TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/rootdir/etc/fstab.qcom BOARD_HAS_DOWNLOAD_MODE := true diff --git a/extract-files.py b/extract-files.py index f13ee18..7df1f5c 100755 --- a/extract-files.py +++ b/extract-files.py @@ -32,8 +32,6 @@ namespace_imports = [ 'hardware/qcom-caf/sm8650/data-ipa-cfg-mgr', 'vendor/qcom/opensource/dataservices', 'hardware/qcom-caf/wlan', - #'packages/apps/FMRadio/jni/fmr', - #'frameworks/native/libs/vibrator', ] @@ -55,9 +53,8 @@ lib_fixups: lib_fixups_user_type = { blob_fixups: blob_fixups_user_type = { - ('vendor/lib64/libspukeymintdeviceutils.so', 'vendor/lib64/libspukeymint.so', 'vendor/lib64/libhermes.so', 'vendor/lib64/libspukeymintutils.so', 'vendor/lib64/libskeymint10device.so', 'vendor/lib64/liblbs_core.so', 'vendor/lib64/liboemcrypto.so', 'vendor/lib64/libpuresoftkeymasterdevice.so', 'vendor/lib64/libpal_net_if.so', 'vendor/lib64/libsfp_sensor.so', 'vendor/lib64/libkeymaster_portable.so', 'vendor/lib64/mediacas/libclearkeycasplugin.so', 'vendor/lib64/libqcc_sdk.so', 'vendor/lib64/libdk_vnd_service_core.so', 'vendor/lib64/libtlpd_crypto.so', 'vendor/lib64/libsec-ril.so', 'vendor/lib64/libcppbor_external.so', 'vendor/lib64/libucm_tlc_tz_esecomm.so', 'vendor/lib64/libqms.so', 'vendor/lib64/libskeymint_cli.so', 'vendor/lib64/libengmode15.so', 'vendor/lib64/libkeymaster4_1support.so', 'vendor/lib64/libizat_core.so', 'vendor/lib64/libspcom.so', 'vendor/lib64/libFaceService.so', 'vendor/lib64/uwb_uci.hal.so', 'vendor/lib64/libnicm_utils.so', 'vendor/lib64/mediadrm/libdrmclearkeyplugin.so', 'vendor/lib64/libkeymaster4support.so', 'vendor/lib64/libsdmextension.so'): blob_fixup() - .replace_needed('libcrypto.so', 'libcrypto-v33.so') - .add_needed('android.hardware.security.rkp-V3-ndk.so'), + 'vendor/lib64/libskeymint_cli.so': blob_fixup() + .replace_needed('libcrypto.so', 'libcrypto-v33.so'), 'vendor/etc/seccomp_policy/atfwd@2.0.policy': blob_fixup() .add_line_if_missing('gettid: 1'), } # fmt: skip