From 6c70d1234ae29bd2dc46c00426c20403be04c3a6 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Tue, 10 Sep 2024 01:42:47 +0300 Subject: [PATCH] sm7325-common: extract-files improvements Change-Id: I517698ca3b5a93e10a5b167417631c7f8d0ab9e2 --- proprietary-files.txt | 20 +++++++++----------- setup-makefiles.sh | 4 ++-- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/proprietary-files.txt b/proprietary-files.txt index 113eaab..7a94053 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -1,5 +1,11 @@ # All unpinned blobs below are extracted from dubai_g-user 14 U1RD34.80-40 f0ea3-81bef release-keys - RETAIL variant. +# Current blobs with ELF checks disabled: +# libcne, libwqe, lowi-server, mutualex depend on libwpa_client, which is a gnu makefile target +# libmdmcutback depends on libqsap_sdk, which is a gnu makefile target +# libmotext_inf, libril-qcril-hook-oem depend on libril, which is a gnu makefile target +# libqti-perfd depends on libthermalclient, which is device specific + # ADSP vendor/bin/adsprpcd vendor/bin/dspservice @@ -173,14 +179,12 @@ vendor/etc/cne/wqeclient/VZW/VZW_profile5.xml vendor/etc/cne/wqeclient/VZW/VZW_profile6.xml vendor/etc/default-permissions/com.qualcomm.qti.cne.xml vendor/etc/init/cnd.rc -# libcne depends on libwpa_client, which is a gnu makefile target vendor/lib64/libcne.so;DISABLE_CHECKELF vendor/lib64/libcneapiclient.so vendor/lib64/libcneoplookup.so vendor/lib64/libcneqmiutils.so vendor/lib64/libjnihelper.so vendor/lib64/libwms.so -# libwqe depends on libwpa_client, which is a gnu makefile target vendor/lib64/libwqe.so;DISABLE_CHECKELF vendor/lib64/libxml.so vendor/lib64/vendor.qti.data.factory@2.0.so @@ -340,7 +344,7 @@ system_ext/lib64/vendor.qti.hardware.dpmservice@1.0.so system_ext/priv-app/dpmserviceapp/dpmserviceapp.apk vendor/bin/dpmQmiMgr vendor/etc/init/dpmQmiMgr.rc -vendor/lib64/com.qualcomm.qti.dpm.api@1.0.so;MODULE=com.qualcomm.qti.dpm.api@1.0-vendor +vendor/lib64/com.qualcomm.qti.dpm.api@1.0.so;MODULE_SUFFIX=_vendor vendor/lib64/libdpmqmihal.so # DRM @@ -371,7 +375,7 @@ vendor/lib64/vendor.qti.hardware.eid@1.0.so # FM vendor/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so -vendor/lib64/vendor.qti.hardware.fm@1.0.so;MODULE=vendor.qti.hardware.fm@1.0-vendor +vendor/lib64/vendor.qti.hardware.fm@1.0.so;MODULE_SUFFIX=_vendor # Gatekeeper vendor/bin/hw/android.hardware.gatekeeper@1.0-service-qti @@ -380,7 +384,6 @@ vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so # GNSS vendor/bin/loc_launcher -# lowi-server depends on libwpa_client, which is a gnu makefile target vendor/bin/lowi-server;DISABLE_CHECKELF vendor/bin/mlid vendor/bin/xtra-daemon @@ -589,7 +592,6 @@ vendor/lib/libperfconfig.so vendor/lib/libperfgluelayer.so vendor/lib/libperfioctl.so vendor/lib/libqti-perfd-client.so -# libqti-perfd depends on libthermalclient, which is device specific vendor/lib/libqti-perfd.so;DISABLE_CHECKELF vendor/lib/libqti-util.so vendor/lib/libqti-utils.so @@ -601,7 +603,6 @@ vendor/lib64/libperfconfig.so vendor/lib64/libperfgluelayer.so vendor/lib64/libperfioctl.so vendor/lib64/libqti-perfd-client.so -# libqti-perfd depends on libthermalclient, which is device specific vendor/lib64/libqti-perfd.so;DISABLE_CHECKELF vendor/lib64/libqti-util.so vendor/lib64/libqti-utils.so @@ -833,11 +834,9 @@ vendor/lib64/deviceInfoServiceModuleNr.so vendor/lib64/libconfigdb.so vendor/lib64/liblog_vendor.so vendor/lib64/liblqe.so -# libmdmcutback depends on libqsap_sdk, which is a gnu makefile target vendor/lib64/libmdmcutback.so;DISABLE_CHECKELF vendor/lib64/libmdmdetect.so vendor/lib64/libminkdescriptor.so -# libmotext_inf depends on libril, which is a gnu makefile target vendor/lib64/libmotext_inf.so;DISABLE_CHECKELF vendor/lib64/libnetmgr.so vendor/lib64/libnetmgr_common.so @@ -860,7 +859,6 @@ vendor/lib64/libqsocket.so vendor/lib64/libril-db.so vendor/lib64/libril-qc-ltedirectdisc.so vendor/lib64/libril-qc-radioconfig.so -# libril-qcril-hook-oem depends on libril, which is a gnu makefile target vendor/lib64/libril-qcril-hook-oem.so;DISABLE_CHECKELF vendor/lib64/librilqmimiscservices.so vendor/lib64/librilqmiservices.so @@ -987,7 +985,7 @@ vendor/lib64/vendor.qti.ims.rcsuce@1.0.so vendor/lib64/vendor.qti.ims.rcsuce@1.1.so vendor/lib64/vendor.qti.ims.rcsuce@1.2.so vendor/lib64/vendor.qti.imsrtpservice@3.0-service-Impl.so -vendor/lib64/vendor.qti.imsrtpservice@3.0.so;MODULE=vendor.qti.imsrtpservice@3.0-vendor +vendor/lib64/vendor.qti.imsrtpservice@3.0.so;MODULE_SUFFIX=_vendor # Sensors vendor/bin/hw/vendor.qti.hardware.sensorscalibrate@1.0-service diff --git a/setup-makefiles.sh b/setup-makefiles.sh index 56e9208..da83ee2 100755 --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -39,7 +39,7 @@ function lib_to_package_fixup_vendor_variants() { com.qualcomm.qti.dpm.api@1.0 | \ vendor.qti.hardware.fm@1.0 | \ vendor.qti.imsrtpservice@3.0) - echo "$1-vendor" + echo "$1_vendor" ;; libofflinelog | \ libqsap_sdk | \ @@ -78,7 +78,7 @@ if [ -s "${MY_DIR}/../../${VENDOR}/${DEVICE}/proprietary-files.txt" ]; then write_headers # The standard device blobs - write_makefiles "${MY_DIR}/../../${VENDOR}/${DEVICE}/proprietary-files.txt" true + write_makefiles "${MY_DIR}/../../${VENDOR}/${DEVICE}/proprietary-files.txt" if [ -f "${MY_DIR}/../../${VENDOR}/${DEVICE}/proprietary-firmware.txt" ]; then append_firmware_calls_to_makefiles "${MY_DIR}/../../${VENDOR}/${DEVICE}/proprietary-firmware.txt"