From de14303efb30d946a6de837cdedb3204c37581e9 Mon Sep 17 00:00:00 2001 From: David Wronek Date: Thu, 23 Jan 2025 20:19:37 +0100 Subject: [PATCH] e1q: Add missing audio lib Change-Id: If7be80f19b93ce2a13fbb5b74b87690ffefc088d --- BoardConfig.mk | 1 - configs/audio/audio_effects_haptic.xml | 12 - configs/audio/audio_effects_sec.xml | 78 --- configs/audio/audio_policy_configuration.xml | 516 +++++++++++++++++++ device.mk | 16 +- proprietary-files.txt | 5 +- system.prop | 179 ------- 7 files changed, 524 insertions(+), 283 deletions(-) delete mode 100644 configs/audio/audio_effects_haptic.xml delete mode 100644 configs/audio/audio_effects_sec.xml create mode 100644 configs/audio/audio_policy_configuration.xml delete mode 100644 system.prop diff --git a/BoardConfig.mk b/BoardConfig.mk index 33056e6..0917428 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -202,7 +202,6 @@ BOARD_USES_QCOM_HARDWARE := true TARGET_BOARD_PLATFORM := pineapple # Properties -TARGET_SYSTEM_PROP += $(DEVICE_PATH)/system.prop TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop TARGET_PRODUCT_PROP += $(DEVICE_PATH)/product.prop TARGET_SYSTEM_EXT_PROP += $(DEVICE_PATH)/system_ext.prop diff --git a/configs/audio/audio_effects_haptic.xml b/configs/audio/audio_effects_haptic.xml deleted file mode 100644 index c6c118a..0000000 --- a/configs/audio/audio_effects_haptic.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/configs/audio/audio_effects_sec.xml b/configs/audio/audio_effects_sec.xml deleted file mode 100644 index 1c08a16..0000000 --- a/configs/audio/audio_effects_sec.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/configs/audio/audio_policy_configuration.xml b/configs/audio/audio_policy_configuration.xml new file mode 100644 index 0000000..5a1aa09 --- /dev/null +++ b/configs/audio/audio_policy_configuration.xml @@ -0,0 +1,516 @@ + + + + + + + + + + + + + + + + + + + Earpiece + Speaker + Telephony Tx + Built-In Mic + Built-In Back Mic + FM Tuner + Telephony Rx + Echo Reference + + Speaker + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/device.mk b/device.mk index c4eadf0..559e8dd 100644 --- a/device.mk +++ b/device.mk @@ -60,22 +60,14 @@ AUDIO_HAL_DIR := hardware/qcom-caf/sm8650/audio/primary-hal AUDIO_PAL_DIR := hardware/qcom-caf/sm8650/audio/pal PRODUCT_COPY_FILES += \ - $(AUDIO_HAL_DIR)/configs/pineapple/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_pineapple/audio_effects.xml \ - $(AUDIO_HAL_DIR)/configs/pineapple/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_pineapple/audio_effects.conf \ $(AUDIO_HAL_DIR)/configs/common/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ - $(AUDIO_HAL_DIR)/configs/common/bluetooth_qti_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_qti_audio_policy_configuration.xml \ - $(AUDIO_HAL_DIR)/configs/common/bluetooth_qti_hearing_aid_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_qti_hearing_aid_audio_policy_configuration.xml \ + $(AUDIO_HAL_DIR)/configs/pineapple/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_pineapple/audio_effects.conf \ + $(AUDIO_HAL_DIR)/configs/pineapple/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_pineapple/audio_effects.xml \ $(AUDIO_HAL_DIR)/configs/pineapple/microphone_characteristics.xml:$(TARGET_COPY_OUT_VENDOR)/etc/microphone_characteristics.xml \ $(AUDIO_PAL_DIR)/configs/pineapple/card-defs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/card-defs.xml \ - $(AUDIO_HAL_DIR)/configs/pineapple/mem_logger_config.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mem_logger_config.xml \ - $(LOCAL_PATH)/configs/audio/audio_effects_haptic.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects_haptic.xml \ - $(LOCAL_PATH)/configs/audio/audio_effects_sec.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects_sec.xml \ - $(LOCAL_PATH)/configs/audio/audio_effects_spatializer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects_spatializer.xml \ $(LOCAL_PATH)/configs/audio/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \ - $(LOCAL_PATH)/configs/audio/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ - $(LOCAL_PATH)/configs/audio/dax3_media_codecs_dolby_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/dax3_media_codecs_dolby_audio.xml \ - $(LOCAL_PATH)/configs/audio/situation_audio_policy_volumes_sec.xml:$(TARGET_COPY_OUT_VENDOR)/etc/situation_audio_policy_volumes_sec.xml \ - $(LOCAL_PATH)/configs/audio/usecaseKvManager.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usecaseKvManager.xml + $(LOCAL_PATH)/configs/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_pineapple_qssi/audio_policy_configuration.xml \ + $(LOCAL_PATH)/configs/audio/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml PRODUCT_COPY_FILES += \ frameworks/av/services/audiopolicy/config/bluetooth_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration.xml \ diff --git a/proprietary-files.txt b/proprietary-files.txt index e2ca4e5..ee9d6a7 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -64,12 +64,14 @@ vendor/lib64/libar-pal.so;DISABLE_CHECKELF vendor/lib64/libarmemlog.so vendor/lib64/libats.so vendor/lib64/libaudio_log_utils.so +vendor/lib64/libaudiofeaturestats.so vendor/lib64/libcapiv2svacnnvendor.so vendor/lib64/libcapiv2svarnnvendor.so vendor/lib64/libcapiv2udk7vendor.so vendor/lib64/libcapiv2uvvendor.so vendor/lib64/libcustomva_intf.so vendor/lib64/libdsd2pcm.so +vendor/lib64/libhotword_intf.so vendor/lib64/liblistensoundmodel2vendor.so vendor/lib64/liblx-ar_util.so vendor/lib64/liblx-osal.so @@ -103,6 +105,7 @@ vendor/etc/audio/sku_pineapple/resourcemanager_pineapple_cdp.xml vendor/etc/audio/sku_pineapple/resourcemanager_pineapple_mtp.xml vendor/etc/audio/sku_pineapple/resourcemanager_pineapple_qrd.xml vendor/etc/audio/sku_pineapple/resourcemanager_pineapple_qrd_sku2.xml +vendor/etc/usecaseKvManager.xml # Audio FX modules vendor/lib64/lib_SamsungRec_08020.so @@ -864,6 +867,7 @@ vendor/etc/display/qdcm_calib_data_vtdr6130_amoled_qsync_video_mode_dsi_visionox vendor/etc/display/qdcm_calib_data_vtdr6130_amoled_video_mode_dsi_visionox_panel_with_DSC.json # Dolby +vendor/etc/dax3_media_codecs_dolby_audio.xml vendor/etc/dolby/dax-default.xml vendor/etc/media_codecs_dolby_audio.xml @@ -1607,7 +1611,6 @@ vendor/bin/hw/android.hardware.usb-service.qti # Vibration vendor/bin/hw/vendor.samsung.hardware.vibrator-service vendor/etc/Hapticsconfig.xml -vendor/etc/audio_effects_haptic.xml vendor/etc/init/vendor.samsung.hardware.vibrator-default.rc vendor/etc/vintf/manifest/vendor.samsung.hardware.vibrator-default.xml vendor/lib64/vendor.samsung.hardware.vibrator-V5-ndk.so diff --git a/system.prop b/system.prop deleted file mode 100644 index d9b9d7f..0000000 --- a/system.prop +++ /dev/null @@ -1,179 +0,0 @@ -# Camera -persist.vendor.camera.privapp.list=org.codeaurora.snapcam -vendor.camera.aux.packagelist=org.codeaurora.snapcam - -# CNE -persist.vendor.cne.feature=1 - -# Display -debug.sf.enable_hwc_vds=0 -debug.sf.latch_unsignaled=1 -ro.hwui.drop_shadow_cache_size=6 -ro.hwui.gradient_cache_size=1 -ro.hwui.layer_cache_size=48 -ro.hwui.path_cache_size=32 -ro.hwui.r_buffer_cache_size=8 -ro.hwui.text_large_cache_height=1024 -ro.hwui.text_large_cache_width=2048 -ro.hwui.text_small_cache_height=1024 -ro.hwui.text_small_cache_width=1024 -ro.hwui.texture_cache_flushrate=0.4 -ro.hwui.texture_cache_size=72 -ro.opengles.version=196610 - -# DRM -ro.netflix.bsp_rev=Q8650-37577-1 - -# Health -ro.charger.enable_suspend=1 - -# NFC -ro.nfc.port=I2C - -# Radio -persist.rild.nitz_long_ons_0= -persist.rild.nitz_long_ons_1= -persist.rild.nitz_long_ons_2= -persist.rild.nitz_long_ons_3= -persist.rild.nitz_plmn= -persist.rild.nitz_short_ons_0= -persist.rild.nitz_short_ons_1= -persist.rild.nitz_short_ons_2= -persist.rild.nitz_short_ons_3= -persist.vendor.radio.atfwd.start=true -ril.subscription.types=NV,RUIM -rild.libpath=/vendor/lib64/libril-qc-hal-qmi.so - -# Sensors -persist.vendor.sensors.enable.mag_filter=true - -# Wi-Fi -ro.wifi.channels= - -# Wi-Fi Display -persist.debug.wfd.enable=1 -persist.sys.wfd.virtual=0 - -# Miscellaneous -arm64.memtag.process.system_server=off -com.samsung.speg.prelauncher.disable=true -config.disable_rtt=true -dalvik.vm.appimageformat=lz4 -dalvik.vm.dex2oat-Xms=64m -dalvik.vm.dex2oat-Xmx=512m -dalvik.vm.dex2oat-max-image-block-size=524288 -dalvik.vm.dex2oat-minidebuginfo=true -dalvik.vm.dex2oat-resolve-startup-strings=true -dalvik.vm.dex2oat64.enabled=true -dalvik.vm.dexopt.secondary=true -dalvik.vm.dexopt.thermal-cutoff=2 -dalvik.vm.finalizer-timeout-ms=60000 -dalvik.vm.heapsize=36m -dalvik.vm.image-dex2oat-Xms=64m -dalvik.vm.image-dex2oat-Xmx=64m -dalvik.vm.lockprof.threshold=500 -dalvik.vm.madvise.artfile.size=4294967295 -dalvik.vm.madvise.odexfile.size=104857600 -dalvik.vm.madvise.vdexfile.size=104857600 -dalvik.vm.minidebuginfo=true -dalvik.vm.systemuicompilerfilter=speed -dalvik.vm.usap_pool_enabled=false -dalvik.vm.usap_pool_refill_delay_ms=3000 -dalvik.vm.usap_pool_size_max=3 -dalvik.vm.usap_pool_size_min=1 -dalvik.vm.usap_refill_threshold=1 -dalvik.vm.useartservice=true -dalvik.vm.usejit=true -debug.atrace.tags.enableflags=0 -debug.codec2.stop_hal_before_surface=0 -debug.hwui.skia_atrace_enabled=false -dev.pm.dyn_samplingrate=1 -log.tag.ClatdController=D -log.tag.ConnectivityManager=D -log.tag.ConnectivityService=D -log.tag.IptablesRestoreController=D -log.tag.NetworkLogger=D -mmp.enable.3g2=true -net.bt.name=Android -persist.backup.ntpServer="0.pool.ntp.org" -persist.data.df.agg.dl_pkt=10 -persist.data.df.agg.dl_size=4096 -persist.data.df.dev_name=rmnet_usb0 -persist.data.df.dl_mode=5 -persist.data.df.iwlan_mux=9 -persist.data.df.mux_count=8 -persist.data.df.ul_mode=5 -persist.data.wda.enable=true -persist.debug.coresight.config=stm-events -persist.device_config.runtime_native_boot.iorap_perfetto_enable=true -persist.fuse_sdcard=true -persist.log.level=0xFFFFFFFF -persist.log.semlevel=0xFFFFFF00 -persist.mm.enable.prefetch=true -persist.rmnet.data.enable=true -persist.sys.force_sw_gles=1 -persist.timed.enable=true -persist.traced.enable=1 -persist.vendor.data.mode=concurrent -persist.vendor.time_services.init=0 -pm.dexopt.ab-ota=speed-profile -pm.dexopt.bg-dexopt=speed-profile -pm.dexopt.boot-after-mainline-update=verify -pm.dexopt.boot-after-ota=verify -pm.dexopt.cmdline=verify -pm.dexopt.first-boot=verify -pm.dexopt.inactive=verify -pm.dexopt.install=speed-profile -pm.dexopt.install-bulk=speed-profile -pm.dexopt.install-bulk-downgraded=verify -pm.dexopt.install-bulk-secondary=verify -pm.dexopt.install-bulk-secondary-downgraded=extract -pm.dexopt.install-fast=skip -pm.dexopt.post-boot=extract -pm.dexopt.shared=speed -qcom.hw.aac.encoder=true -qemu.hw.mainkeys=0 -ro.actionable_compatible_property.enabled=true -ro.build.2ndbrand=false -ro.build.changelist=29543898 -ro.build.display_build_number=true -ro.build.official.developer=false -ro.build.official.release=true -ro.build.version.sem=3402 -ro.build.version.sep=150500 -ro.camerax.extensions.enabled=true -ro.config.dmverity=G -ro.config.iccc_version=3.0 -ro.config.knox=v30 -ro.config.rm_preload_enabled=1 -ro.dalvik.vm.native.bridge=0 -ro.kernel.qemu=0 -ro.kernel.qemu.gles=0 -ro.launcher.blur.appLaunch=0 -ro.media.recorder-max-base-layer-fps=60 -ro.oem_unlock_supported=1 -ro.postinstall.fstab.prefix=/system -ro.product.property_source_order=odm,vendor,product,system_ext,system -ro.product_ship=true -ro.security.bio.release=1 -ro.security.bio.ver=1.1 -ro.security.bt.release=1 -ro.security.bt.ver=1.0 -ro.security.fips.ux=Enabled -ro.security.fips_bssl.ver=1.7 -ro.security.mdf.release=1 -ro.security.mdf.ux=Enabled -ro.security.mdf.ver=3.3 -ro.security.wlan.release=2 -ro.security.wlan.ver=1.0 -ro.smps.gain.spk=0.3 -ro.system.build.version.sehi=3405 -ro.system.qb.id=86324119 -ro.vendor.qti.va_aosp.support=1 -security.mdf=None -security.mdf.result=None -security.perf_harden=1 -sys.hqm.support=true -sys.qca1530=detect -vendor.mm.enable.qcom_parser=16777215 -