sm7325-common: setup ELF checks

Change-Id: I5996ce4146063cc0d1d9c13f7bef9ece134c00c6
2025-01-02 12:53:36 +01:00
parent 792122c19f
commit 1d412f9c92
5 changed files with 63 additions and 130 deletions
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -153,9 +153,7 @@ AUDIO_FEATURE_ENABLED_INSTANCE_ID := true
 AUDIO_FEATURE_ENABLED_PROXY_DEVICE := true
 AUDIO_FEATURE_ENABLED_SSR := false
 AUDIO_FEATURE_ENABLED_SVA_MULTI_STAGE := true
-BOARD_SUPPORTS_OPENSOURCE_STHAL := true
 BOARD_SUPPORTS_SOUND_TRIGGER := true
-BOARD_USES_ALSA_AUDIO := true

 # Camera
 SOONG_CONFIG_NAMESPACES += samsungCameraVars
--- a/common.mk
+++ b/common.mk
@@ -87,7 +87,8 @@ PRODUCT_PACKAGES += \
    libqcomvisualizer \
    libqcomvoiceprocessing \
    libqcompostprocbundle \
-    libvolumelistener
+    libvolumelistener \
+    libqti_vndfwk_detect.vendor_32

 PRODUCT_COPY_FILES += \
    $(COMMON_PATH)/audio/configs/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \
@@ -115,7 +116,8 @@ PRODUCT_PACKAGES += \
    android.hardware.camera.provider-service.samsung \
    libgrallocusage.vendor \
    libutilscallstack.vendor \
-    vendor.qti.hardware.camera.device@1.0.vendor
+    vendor.qti.hardware.camera.device@1.0.vendor \
+    libui_shim.vendor

 # CAS
 PRODUCT_PACKAGES += \
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -72,7 +72,7 @@ function blob_fixup() {
            xxd -p -c0 "${2}" | sed "s/600e40f9820c805224008052e10315aa080040f9e30314aa/600e40f9820c805224008052e10315aa080040f9030080d2/g" | xxd -r -p > "${2}".patched
            mv "${2}".patched "${2}"
            ;;
-        vendor/lib64/hw/gatekeeper.mdfpp.so|vendor/lib64/libskeymaster4device.so)
+        vendor/lib64/hw/gatekeeper.mdfpp.so|vendor/lib64/libskeymaster4device.so|vendor/lib64/libkeymaster_helper.so)
            [ "$2" = "" ] && return 0
            "${PATCHELF}" --replace-needed "libcrypto.so" "libcrypto-v33.so" "${2}"
            ;;
@@ -80,6 +80,10 @@ function blob_fixup() {
            [ "$2" = "" ] && return 0
            "${PATCHELF}" --add-needed "libcrypto_shim.so" "${2}"
            ;;
+        vendor/lib/unihal_main@2.15.so|vendor/lib64/unihal_main@2.15.so)
+            [ "$2" = "" ] && return 0
+            "${PATCHELF}" --add-needed "libui_shim.so" "${2}"
+            ;;
        *)
            return 1
            ;;
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -27,7 +27,6 @@ vendor/lib/rfsa/adsp/libbitml_nsp_skel.so
 vendor/lib/rfsa/adsp/capi_v2_aptX_CLHDAD_Encoder.so
 vendor/lib/rfsa/adsp/libcvpdsp_2_1.so
 vendor/lib/rfsa/adsp/libfastcvadsp.so
-vendor/lib/rfsa/adsp/libsns_low_lat_stream_skel.so
 vendor/lib/rfsa/adsp/libadsp_jpege_skel.so
 vendor/lib/rfsa/adsp/libfastcvdsp_skel.so
 vendor/lib/rfsa/adsp/libapps_mem_heap.so
@@ -35,18 +34,16 @@ vendor/lib/rfsa/adsp/libcamera_nn_skel.so
 vendor/lib/rfsa/adsp/libscveObjectSegmentation_skel.so
 vendor/lib/rfsa/adsp/libscveT2T_skel.so
 vendor/lib/rfsa/adsp/libsnpe_dsp_v68_domains_v3_skel.so
-vendor/lib/rfsa/adsp/libsns_device_mode_skel.so
 vendor/lib/rfsa/adsp/libbitml_nsp_v2_skel.so
 vendor/lib/rfsa/adsp/libdspCV_skel.so
 vendor/lib/rfsa/adsp/bm2n06.bin
 vendor/lib/rfsa/adsp/libmctfengine_skel.so
 vendor/lib/rfsa/adsp/bm2n12.bin
 vendor/lib/rfsa/adsp/libdsp_streamer_binning.so
-vendor/lib64/rfsa/adsp/libsns_low_lat_stream_skel.so
-vendor/lib64/rfsa/adsp/libsns_device_mode_skel.so
 vendor/lib64/libSNPE.so
 vendor/lib64/libsnpe_wrapper.so
 vendor/lib64/libsnpe_dsp_domains_v3.so
+vendor/lib64/libc++_shared.so

 # Audio
 vendor/lib/libaudioparsers.so
@@ -55,35 +52,29 @@ vendor/lib/libsecaudiocoreutils.so
 vendor/lib/libaudio_log_utils.so
 vendor/lib/libaudioconfigstore.so
 vendor/lib/vendor.qti.hardware.audiohalext@1.0.so
-vendor/lib64/libaudioparsers.so
-vendor/lib64/libsecaudioinfo.so
-vendor/lib64/libsecaudiocoreutils.so
 vendor/lib64/libaudioconfigstore.so
 vendor/lib/libsamsungVoipResampler.so
 vendor/lib/lib_soundaliveresampler.so
 vendor/lib/lib_SoundAlive_SRC384_ver320.so
 vendor/lib/librecordalive.so
 vendor/lib/lib_SamsungRec_07010.so
-vendor/lib/libexthwplugin.so
-vendor/lib/libsndmonitor.so
-vendor/lib/libbatterylistener.so
-vendor/lib/liba2dpoffload.so
+vendor/lib/libexthwplugin.so;MODULE_SUFFIX=_vendor
+vendor/lib/libsndmonitor.so;MODULE_SUFFIX=_vendor
+vendor/lib/libbatterylistener.so;MODULE_SUFFIX=_vendor
+vendor/lib/liba2dpoffload.so;MODULE_SUFFIX=_vendor
 vendor/lib/libadm.so
-vendor/lib/libcomprcapture.so
-vendor/lib/libhdmiedid.so
-vendor/lib/libhdmipassthru.so
-vendor/lib/libhfp.so
+vendor/lib/libcomprcapture.so;MODULE_SUFFIX=_vendor
+vendor/lib/libhdmiedid.so;MODULE_SUFFIX=_vendor
+vendor/lib/libhdmipassthru.so;MODULE_SUFFIX=_vendor
+vendor/lib/libhfp.so;MODULE_SUFFIX=_vendor
 vendor/lib/libqtigef.so
-vendor/lib64/libqtigef.so
-vendor/lib/libcirrusspkrprot.so
+vendor/lib/libcirrusspkrprot.so;MODULE_SUFFIX=_vendor
 vendor/lib/libsurround_3mic_proc.so
 vendor/lib/libdrc.so
-vendor/lib/libspkrprot.so
+vendor/lib/libspkrprot.so;MODULE_SUFFIX=_vendor
 vendor/lib/libprofileparamstorage.so
 vendor/lib/libspatializerparamstorage.so
-vendor/lib64/libspatializerparamstorage.so
 vendor/lib/spatializer-aidl-V1-cpp.so
-vendor/lib64/spatializer-aidl-V1-cpp.so
 vendor/etc/audio_tuning_mixer.txt

 # Soundtrigger
@@ -108,12 +99,6 @@ vendor/lib/soundfx/libqcreverb.so
 vendor/lib/soundfx/libshoebox.so
 vendor/lib/soundfx/libqcbassboost.so
 vendor/lib/soundfx/libswspatializer.so
-vendor/lib64/soundfx/libqcvirt.so
-vendor/lib64/soundfx/libasphere.so
-vendor/lib64/soundfx/libqcreverb.so
-vendor/lib64/soundfx/libshoebox.so
-vendor/lib64/soundfx/libqcbassboost.so
-vendor/lib64/soundfx/libswspatializer.so
 system_ext/etc/permissions/audiosphere.xml
 system_ext/framework/audiosphere.jar

@@ -131,8 +116,6 @@ vendor/lib64/vendor.samsung.hardware.bluetooth@2.0.so
 vendor/lib/libidl.so
 vendor/lib64/libidl.so
 vendor/lib64/com.qualcomm.qti.ant@1.0.so
-vendor/lib/libqti_vndfwk_detect.so
-vendor/lib64/libqti_vndfwk_detect.so
 vendor/lib/libbthost_if.so
 vendor/lib64/libbthost_if.so
 vendor/lib64/vendor.qti.hardware.fm@1.0.so
@@ -145,136 +128,51 @@ vendor/firmware/msnv11.bin
 # Camera
 vendor/lib/libsensorndkbridge.so
 vendor/lib64/libsensorndkbridge.so
-vendor/lib/libsuper_night_interface.so
 vendor/lib/libcamera_nn_stub.so
 vendor/lib/libscveCommon.so
 vendor/lib/libuniplugin.so
-vendor/lib/libIDDQD_core.so
-vendor/lib/libHprFace_GAE_api.camera.samsung.so
 vendor/lib/libcamxswprocessalgo.so
 vendor/lib/libscveObjectTracker.so
-vendor/lib/libjpegQtable_interface.so
-vendor/lib/libimagecodec_native.quram.so
-vendor/lib/libHandGesture.camera.samsung.so
-vendor/lib/libhand_interaction.uniplugin@1.0.so
-vendor/lib/libarcsoft_picportrait_video.so
 vendor/lib/libcamxstatscore.so
-vendor/lib/libexifa.camera.samsung.so
 vendor/lib/libcamxfdengine.so
 vendor/lib/libcamxqsatalgo.so
-vendor/lib/libarcsoft_super_night_raw.so
-vendor/lib/libjpegencoder_sw.unifunc.so
 vendor/lib/hw/camera.unihal.default.so
-vendor/lib/libbeautyshot.arcsoft.so
-vendor/lib/libvideobeauty.arcsoft.so
-vendor/lib/libHpr_RecGAE_cvFeature_v1.0.camera.samsung.so
-vendor/lib/libfocuspeaking.so
-vendor/lib/libscaler_hw.unifunc.so
-vendor/lib/libFace_Landmark_API.camera.samsung.so
-vendor/lib/libOpenCv.camera.samsung.so
 vendor/lib/libscveCommon_stub.so
 vendor/lib/libqcwrappercommon.so
 vendor/lib/libscveObjectSegmentation_stub.so
-vendor/lib/libsocial_image_enhancement.uniplugin@1.0.so
-vendor/lib/libsegmentationeffect.uniplugin@1.0.so
 vendor/lib/libscveObjectTracker_stub.so
-vendor/lib/libBeauty_v4.camera.samsung.so
 vendor/lib/libsensorlistener.so
-vendor/lib/libvideobeauty_interface.so
-vendor/lib/libpadm.so
-vendor/lib/libfocuspeaking_interface.so
-vendor/lib/libimage_enhancement.arcsoft.so
-vendor/lib/libvideobeauty.uniplugin@1.0.so
 vendor/lib/libscveObjectSegmentation.so
-vendor/lib/liblivefocus_capture_engine.so
-vendor/lib/libsmartfocus_interface.so
 vendor/lib/libswregistrationalgo.so
-vendor/lib/libhandgesture.arcsoft.so
 vendor/lib/libcom.qti.chinodeutils.so
-vendor/lib/liblivefocus_preview_engine.so
-vendor/lib/libDualCamBokehCapture.camera.samsung.so
-vendor/lib/libhypermotion_interface.so
-vendor/lib/liblivefocus_preview_interface.so
-vendor/lib/libhigh_dynamic_range_bokeh.so
-vendor/lib/liblivefocus_capture_interface.so
-vendor/lib/libswldc_capture_core.camera.samsung.so
-vendor/lib/libIDDQD_interface.so
-vendor/lib/libSEF.quram.so
 vendor/lib/libcamxtintlessalgo.so
 vendor/lib/libmpbase.so
-vendor/lib/libLocalTM_capture_core.camera.samsung.so
-vendor/lib/libvdis_core.so
 vendor/lib/unihal_main@2.15.so
 vendor/lib/unihal_cutils@2.15.so
 vendor/lib/unihal_uniplugin@1.0.so
-vendor/lib/libface_landmark.arcsoft.so
-vendor/lib64/libsuper_night_interface.so
 vendor/lib64/libcamera_nn_stub.so
 vendor/lib64/libscveCommon.so
-vendor/lib64/libformatConverter.unifunc.so
 vendor/lib64/libuniplugin.so
-vendor/lib64/libIDDQD_core.so
-vendor/lib64/libHprFace_GAE_api.camera.samsung.so
 vendor/lib64/libcamxswprocessalgo.so
 vendor/lib64/libscveObjectTracker.so
-vendor/lib64/libjpegQtable_interface.so
-vendor/lib64/libimagecodec_native.quram.so
-vendor/lib64/libHandGesture.camera.samsung.so
-vendor/lib64/libhand_interaction.uniplugin@1.0.so
-vendor/lib64/libarcsoft_picportrait_video.so
-vendor/lib64/libDLInterface.camera.samsung.so
 vendor/lib64/libcamxstatscore.so
-vendor/lib64/libexifa.camera.samsung.so
 vendor/lib64/libcamxfdengine.so
 vendor/lib64/libcamxqsatalgo.so
-vendor/lib64/libarcsoft_super_night_raw.so
-vendor/lib64/libjpegencoder_sw.unifunc.so
 vendor/lib64/hw/camera.unihal.default.so
-vendor/lib64/libbeautyshot.arcsoft.so
-vendor/lib64/libvideobeauty.arcsoft.so
-vendor/lib64/libHpr_RecGAE_cvFeature_v1.0.camera.samsung.so
 vendor/lib64/libremosaiclib.so
-vendor/lib64/libfocuspeaking.so
-vendor/lib64/libscaler_hw.unifunc.so
-vendor/lib64/libFace_Landmark_API.camera.samsung.so
-vendor/lib64/libOpenCv.camera.samsung.so
 vendor/lib64/libscveCommon_stub.so
 vendor/lib64/libqcwrappercommon.so
 vendor/lib64/libscveObjectSegmentation_stub.so
-vendor/lib64/libsocial_image_enhancement.uniplugin@1.0.so
-vendor/lib64/libsegmentationeffect.uniplugin@1.0.so
-vendor/lib64/libLocalTM_wrapper.camera.samsung.so
 vendor/lib64/libscveObjectTracker_stub.so
-vendor/lib64/libBeauty_v4.camera.samsung.so
 vendor/lib64/libsensorlistener.so
-vendor/lib64/libvideobeauty_interface.so
-vendor/lib64/libpadm.so
-vendor/lib64/libfocuspeaking_interface.so
-vendor/lib64/libimage_enhancement.arcsoft.so
-vendor/lib64/libvideobeauty.uniplugin@1.0.so
 vendor/lib64/libscveObjectSegmentation.so
-vendor/lib64/liblivefocus_capture_engine.so
-vendor/lib64/libsmartfocus_interface.so
 vendor/lib64/libswregistrationalgo.so
-vendor/lib64/libhandgesture.arcsoft.so
 vendor/lib64/libcom.qti.chinodeutils.so
-vendor/lib64/liblivefocus_preview_engine.so
-vendor/lib64/libDualCamBokehCapture.camera.samsung.so
-vendor/lib64/libhypermotion_interface.so
-vendor/lib64/liblivefocus_preview_interface.so
-vendor/lib64/libhigh_dynamic_range_bokeh.so
-vendor/lib64/liblivefocus_capture_interface.so
-vendor/lib64/libswldc_capture_core.camera.samsung.so
-vendor/lib64/libIDDQD_interface.so
-vendor/lib64/libSEF.quram.so
 vendor/lib64/libcamxtintlessalgo.so
 vendor/lib64/libmpbase.so
-vendor/lib64/libLocalTM_capture_core.camera.samsung.so
-vendor/lib64/libvdis_core.so
 vendor/lib64/unihal_main@2.15.so
 vendor/lib64/unihal_cutils@2.15.so
 vendor/lib64/unihal_uniplugin@1.0.so
-vendor/lib64/libface_landmark.arcsoft.so
 vendor/lib/libofflinelog.so
 vendor/lib64/libofflinelog.so
 vendor/lib/libofflinedump.so
@@ -293,8 +191,6 @@ vendor/lib/libos.so
 vendor/lib64/libos.so
 vendor/lib/libthreadutils.so
 vendor/lib64/libthreadutils.so
-vendor/lib/vendor.qti.hardware.camera.postproc@1.0.so
-vendor/lib64/vendor.qti.hardware.camera.postproc@1.0.so
 vendor/lib/vendor.qti.hardware.camera.postproc@1.0-service-impl.so
 vendor/lib64/vendor.qti.hardware.camera.postproc@1.0-service-impl.so
 vendor/lib/libchilog.so
@@ -323,10 +219,11 @@ vendor/lib/libbitmlengine.so
 vendor/lib64/libbitmlengine.so
 vendor/lib/libbitmlenginev2.so
 vendor/lib64/libbitmlenginev2.so
-vendor/lib/com.qti.chiusecaseselector.so
-vendor/lib64/com.qti.chiusecaseselector.so
-vendor/lib/libcamerapostproc.so
-vendor/lib64/libcamerapostproc.so
+# Need com.qti.feature2.generic and com.qti.chi.override from device-specific trees
+vendor/lib/com.qti.chiusecaseselector.so;DISABLE_DEPS
+vendor/lib64/com.qti.chiusecaseselector.so;DISABLE_DEPS
+vendor/lib/libcamerapostproc.so;DISABLE_DEPS
+vendor/lib64/libcamerapostproc.so;DISABLE_DEPS
 vendor/lib/libcamxexternalformatutils.so
 vendor/lib64/libcamxexternalformatutils.so
 vendor/lib/libipebpsstriping170.so
@@ -436,7 +333,7 @@ vendor/lib64/hw/gatekeeper.mdfpp.so|7b185aca7ae62e2b7104d36740587a351cc4867e
 -vendor/app/CACertService/CACertService.apk
 vendor/lib/libjnihelper.so
 vendor/lib64/libjnihelper.so
-vendor/bin/lowi-server
+vendor/bin/lowi-server;DISABLE_DEPS
 vendor/bin/xtra-daemon
 vendor/etc/seccomp_policy/gnss@2.0-xtra-daemon.policy
 vendor/bin/loc_launcher
@@ -817,14 +714,12 @@ vendor/etc/plmn_se13.bin
 vendor/etc/mtu-conf.xml
 vendor/lib/libconfigdb.so
 vendor/lib64/libconfigdb.so
-vendor/lib/libdsi_netctrl.so
-vendor/lib64/libdsi_netctrl.so
 vendor/lib/libqcmaputils.so
 vendor/lib64/libqcmaputils.so
 vendor/lib64/libengmode_client.so
 vendor/lib64/libsec-ril.so|46d38d55ae2d050f4ee91d3f2fa809a970142ae7
-vendor/lib/libsecril-client.so
-vendor/lib64/libsecril-client.so
+vendor/lib/libsecril-client.so;MODULE_SUFFIX=_vendor
+vendor/lib64/libsecril-client.so;MODULE_SUFFIX=_vendor
 vendor/lib64/libril_sem.so
 vendor/lib64/libSemTelephonyProps.so
 vendor/lib64/libSemDataProps.so
@@ -840,7 +735,6 @@ vendor/etc/locale/plmn_delta_zh-rHK.bin
 vendor/etc/plmn_delta_attaio.bin
 vendor/etc/sec_config_oem
 vendor/etc/pdpcnt-conf.xml
-vendor/lib64/libnlnetmgr.so
 vendor/lib/libqrtr.so
 vendor/lib64/libqrtr.so
 vendor/lib/libsystem_health_mon.so
@@ -1045,6 +939,7 @@ vendor/lib/libops.so
 vendor/lib/libQSEEComAPI.so
 vendor/lib/librpmb.so
 vendor/lib/libsecureui_svcsock.so
+vendor/lib/vendor.qti.hardware.tui_comm@1.0.so
 vendor/lib/libssd.so
 vendor/lib/libspl.so
 vendor/lib/vendor.qti.hardware.qseecom@1.0.so
@@ -1061,6 +956,7 @@ vendor/lib64/libops.so
 vendor/lib64/libQSEEComAPI.so
 vendor/lib64/librpmb.so
 vendor/lib64/libsecureui_svcsock.so
+vendor/lib64/vendor.qti.hardware.tui_comm@1.0.so
 vendor/lib64/libssd.so
 vendor/lib64/libspl.so
 vendor/lib64/vendor.qti.hardware.qseecom@1.0.so
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -20,6 +20,39 @@ if [ ! -f "${HELPER}" ]; then
 fi
 source "${HELPER}"

+function vendor_imports() {
+    cat <<EOF >>"$1"
+		"device/samsung/sm7325-common",
+		"hardware/qcom-caf/sm8350",
+		"hardware/qcom-caf/wlan",
+		"hardware/samsung",
+		"vendor/qcom/opensource/dataservices",
+		"vendor/qcom/opensource/display",
+EOF
+}
+
+function lib_to_package_fixup_vendor_variants() {
+    if [ "$2" != "vendor" ]; then
+        return 1
+    fi
+    case "$1" in
+        libsndmonitor | libexthwplugin | libbatterylistener | \
+        liba2dpoffload | libcomprcapture | libhdmiedid | libhdmipassthru | libhfp | \
+        libcirrusspkrprot | libspkrprot | libsecril-client)
+            echo "$1_vendor"
+            ;;
+        *)
+            return 1
+            ;;
+    esac
+}
+
+function lib_to_package_fixup() {
+    lib_to_package_fixup_clang_rt_ubsan_standalone "$1" ||
+        lib_to_package_fixup_proto_3_9_1 "$1" ||
+        lib_to_package_fixup_vendor_variants "$@"
+}
+
 # Initialize the helper for common
 setup_vendor "${DEVICE_COMMON}" "${VENDOR_COMMON:-$VENDOR}" "${ANDROID_ROOT}" true