e3q: Fix sound card not being online

Change-Id: I41af3a7636fadb7ce207f7c3b5e087b047903b56

BoardConfig.mk

@@ -21,20 +21,21 @@ TARGET_CPU_VARIANT_RUNTIME := kryo300
 TARGET_OTA_ASSERT_DEVICE := e3q
 
 # Audio
-$(call soong_config_set, android_hardware_audio, run_64bit, true)
-
-AUDIO_FEATURE_ENABLED_PROXY_DEVICE := true
-AUDIO_FEATURE_ENABLED_DTS_EAGLE := false
-AUDIO_FEATURE_ENABLED_PAL_HIDL := true
-AUDIO_FEATURE_ENABLED_AGM_HIDL := true
-AUDIO_FEATURE_ENABLED_LSM_HIDL := true
-AUDIO_FEATURE_ENABLED_HW_ACCELERATED_EFFECTS := false
 AUDIO_FEATURE_ENABLED_DLKM := true
-AUDIO_FEATURE_ENABLED_INSTANCE_ID := true
-AUDIO_FEATURE_ENABLED_KEEP_ALIVE := true
+AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT := true
 AUDIO_FEATURE_ENABLED_GEF_SUPPORT := true
+AUDIO_FEATURE_ENABLED_GKI := true
+AUDIO_FEATURE_ENABLED_INSTANCE_ID := true
+AUDIO_FEATURE_ENABLED_AGM_HIDL := true
+AUDIO_FEATURE_ENABLED_LSM_HIDL := true
+AUDIO_FEATURE_ENABLED_PAL_HIDL := true
+AUDIO_FEATURE_ENABLED_PROXY_DEVICE := true
+AUDIO_FEATURE_ENABLED_SSR := true
 AUDIO_FEATURE_ENABLED_SVA_MULTI_STAGE := true
+BOARD_SUPPORTS_OPENSOURCE_STHAL := true
 BOARD_SUPPORTS_SOUND_TRIGGER := true
+BOARD_USES_ALSA_AUDIO := true
+TARGET_PROVIDES_AUDIO_HAL := true
 TARGET_USES_QCOM_MM_AUDIO := true
 
 # Board
@@ -53,9 +54,9 @@ TARGET_SCREEN_DENSITY := 450
 TARGET_GRALLOC_HANDLE_HAS_UBWCP_FORMAT = true
 
 # DTB / DTBO
-BOARD_INCLUDE_DTB_IN_BOOTIMG := true
-BOARD_USES_QCOM_MERGE_DTBS_SCRIPT := true
-TARGET_NEEDS_DTBOIMAGE := true
+# BOARD_INCLUDE_DTB_IN_BOOTIMG := true
+# BOARD_USES_QCOM_MERGE_DTBS_SCRIPT := true
+# TARGET_NEEDS_DTBOIMAGE := true
 
 # Filesystem
 TARGET_FS_CONFIG_GEN := $(DEVICE_PATH)/config.fs
@@ -65,7 +66,15 @@ BOARD_INIT_BOOT_HEADER_VERSION := 4
 BOARD_MKBOOTIMG_INIT_ARGS += --header_version $(BOARD_INIT_BOOT_HEADER_VERSION)
 
 # Kernel
+TARGET_PREBUILT_KERNEL := $(DEVICE_PATH)/prebuilts/kernel
+TARGET_PREBUILT_DTB := $(DEVICE_PATH)/prebuilts/dtb.img
+BOARD_MKBOOTIMG_ARGS += --dtb $(TARGET_PREBUILT_DTB)
+BOARD_INCLUDE_DTB_IN_BOOTIMG :=
+BOARD_PREBUILT_DTBOIMAGE := $(DEVICE_PATH)/prebuilts/dtbo.img
+BOARD_KERNEL_SEPARATED_DTBO :=
 BOARD_KERNEL_CMDLINE := \
+    ignore_loglevel \
+    debug \
     androidboot.hardware=qcom \
     androidboot.memcg=1 \
     androidboot.usbcontroller=a600000.dwc3 \
@@ -207,7 +216,7 @@ TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/rootdir/etc/fstab.qcom
 BOARD_HAS_DOWNLOAD_MODE := true
 BOARD_INCLUDE_RECOVERY_DTBO := true
 BOARD_USES_FULL_RECOVERY_IMAGE := true
-BOARD_RECOVERY_MKBOOTIMG_ARGS := --header_version 2
+BOARD_RECOVERY_MKBOOTIMG_ARGS := --header_version 2 --dtb $(TARGET_PREBUILT_DTB)
 TARGET_RECOVERY_PIXEL_FORMAT := RGBX_8888
 TARGET_USERIMAGES_USE_F2FS := true
 
@@ -256,6 +265,8 @@ DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \
 # DEVICE_FRAMEWORK_MANIFEST_FILE
 DEVICE_MATRIX_FILE := hardware/qcom-caf/common/compatibility_matrix.xml
 DEVICE_MANIFEST_FILE := \
+    hardware/qcom-caf/sm8550/audio/primary-hal/configs/common/manifest_non_qmaa.xml \
+    hardware/qcom-caf/sm8550/audio/primary-hal/configs/common/manifest_non_qmaa_extn.xml \
     $(DEVICE_PATH)/vintf/manifest.xml \
     $(DEVICE_PATH)/vintf/manifest_pineapple.xml \
 

device.mk

@@ -28,44 +28,38 @@ BOARD_SHIPPING_API_LEVEL := 34
 PRODUCT_SHIPPING_API_LEVEL := $(BOARD_SHIPPING_API_LEVEL)
 
 # Audio
-SOONG_CONFIG_NAMESPACES += android_hardware_audio
-SOONG_CONFIG_android_hardware_audio += \
-    run_64bit
-SOONG_CONFIG_android_hardware_audio_run_64bit := true
-
 PRODUCT_PACKAGES += \
     [email protected] \
-    android.hardware.audio.common-V1-ndk.vendor \
     [email protected] \
     android.hardware.audio.service \
     android.hardware.bluetooth.audio-impl \
     [email protected] \
+    audioadsprpcd \
     audio.bluetooth.default \
-    audio.primary.pineapple \
     audio.r_submix.default \
     audio.usb.default \
-    audioadsprpcd \
-    libagmmixer \
     libagm_compress_plugin \
     libagm_mixer_plugin \
     libagm_pcm_plugin \
     libbatterylistener \
+    libfmpal \
+    libhfp_pal \
     libqcompostprocbundle \
     libqcomvisualizer \
     libqcomvoiceprocessing \
     libsndcardparser \
     libtinycompress \
-    libvolumelistener
+    libvolumelistener \
+    sound_trigger.primary.pineapple \
+    [email protected]
 
 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/common/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/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/Hapticsconfig.xml:$(TARGET_COPY_OUT_VENDOR)/etc/Hapticsconfig.xml \
 
 PRODUCT_COPY_FILES += \
     frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
@@ -146,6 +140,7 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     libcurl.vendor \
     libjsoncpp.vendor \
+    libqti_vndfwk_detect_vendor \
     libsqlite.vendor
 
 # RIL

modules.load

@@ -302,40 +302,6 @@ wcd938x_dlkm.ko
 wcd938x_slave_dlkm.ko
 wcd939x_dlkm.ko
 wcd939x_slave_dlkm.ko
-q6_notifier_dlkm.ko
-spf_core_dlkm.ko
-audpkt_ion_dlkm.ko
-gpr_dlkm.ko
-audio_pkt_dlkm.ko
-q6_dlkm.ko
-adsp_loader_dlkm.ko
-audio_prm_dlkm.ko
-q6_pdr_dlkm.ko
-pinctrl_lpi_dlkm.ko
-swr_dlkm.ko
-swr_ctrl_dlkm.ko
-snd_event_dlkm.ko
-wcd_core_dlkm.ko
-mbhc_dlkm.ko
-wcd9xxx_dlkm.ko
-stub_dlkm.ko
-machine_dlkm.ko
-swr_dmic_dlkm.ko
-swr_haptics_dlkm.ko
-hdmi_dlkm.ko
-lpass_cdc_wsa2_macro_dlkm.ko
-lpass_cdc_wsa_macro_dlkm.ko
-lpass_cdc_va_macro_dlkm.ko
-lpass_cdc_rx_macro_dlkm.ko
-lpass_cdc_tx_macro_dlkm.ko
-lpass_cdc_dlkm.ko
-wsa884x_dlkm.ko
-wsa883x_dlkm.ko
-wcd938x_dlkm.ko
-wcd938x_slave_dlkm.ko
-wcd939x_dlkm.ko
-wcd939x_slave_dlkm.ko
-qcedev-mod_dlkm.ko
 qcrypto-msm_dlkm.ko
 qce50_dlkm.ko
 hdcp_qseecom_dlkm.ko
@@ -343,87 +309,10 @@ qrng_dlkm.ko
 smmu_proxy_dlkm.ko
 smcinvoke_dlkm.ko
 tz_log_dlkm.ko
-qseecom_dlkm.ko
 ubwcp.ko
 btpower.ko
 bt_fm_slim.ko
 radio-i2c-rtc6226-qca.ko
-qca_cld3_kiwi_v2.ko
-cnss2.ko
-cnss_plat_ipc_qmi_svc.ko
-wlan_firmware_service.ko
-cnss_nl.ko
-cnss_prealloc.ko
-cnss_utils.ko
-q6_notifier_dlkm.ko
-spf_core_dlkm.ko
-audpkt_ion_dlkm.ko
-gpr_dlkm.ko
-audio_pkt_dlkm.ko
-q6_dlkm.ko
-adsp_loader_dlkm.ko
-audio_prm_dlkm.ko
-q6_pdr_dlkm.ko
-pinctrl_lpi_dlkm.ko
-swr_dlkm.ko
-swr_ctrl_dlkm.ko
-snd_event_dlkm.ko
-wcd_core_dlkm.ko
-mbhc_dlkm.ko
-wcd9xxx_dlkm.ko
-stub_dlkm.ko
-machine_dlkm.ko
-swr_dmic_dlkm.ko
-swr_haptics_dlkm.ko
-hdmi_dlkm.ko
-lpass_cdc_wsa2_macro_dlkm.ko
-lpass_cdc_wsa_macro_dlkm.ko
-lpass_cdc_va_macro_dlkm.ko
-lpass_cdc_rx_macro_dlkm.ko
-lpass_cdc_tx_macro_dlkm.ko
-lpass_cdc_dlkm.ko
-wsa884x_dlkm.ko
-wsa883x_dlkm.ko
-wcd938x_dlkm.ko
-wcd938x_slave_dlkm.ko
-wcd939x_dlkm.ko
-wcd939x_slave_dlkm.ko
-q6_notifier_dlkm.ko
-spf_core_dlkm.ko
-audpkt_ion_dlkm.ko
-gpr_dlkm.ko
-audio_pkt_dlkm.ko
-q6_dlkm.ko
-adsp_loader_dlkm.ko
-audio_prm_dlkm.ko
-q6_pdr_dlkm.ko
-pinctrl_lpi_dlkm.ko
-swr_dlkm.ko
-swr_ctrl_dlkm.ko
-snd_event_dlkm.ko
-wcd_core_dlkm.ko
-mbhc_dlkm.ko
-wcd9xxx_dlkm.ko
-stub_dlkm.ko
-machine_dlkm.ko
-swr_dmic_dlkm.ko
-swr_haptics_dlkm.ko
-hdmi_dlkm.ko
-lpass_cdc_wsa2_macro_dlkm.ko
-lpass_cdc_wsa_macro_dlkm.ko
-lpass_cdc_va_macro_dlkm.ko
-lpass_cdc_rx_macro_dlkm.ko
-lpass_cdc_tx_macro_dlkm.ko
-lpass_cdc_dlkm.ko
-wsa884x_dlkm.ko
-wsa883x_dlkm.ko
-wcd938x_dlkm.ko
-wcd938x_slave_dlkm.ko
-wcd939x_dlkm.ko
-wcd939x_slave_dlkm.ko
-btpower.ko
-bt_fm_slim.ko
-radio-i2c-rtc6226-qca.ko
 camera.ko
 gsim.ko
 ipam.ko
@@ -438,7 +327,6 @@ rmnet_mem.ko
 rmnet_shs.ko
 rmnet_aps.ko
 rmnet_sch.ko
-rmnet_wlan.ko
 msm_drm.ko
 frpc-adsprpc.ko
 cdsp-loader.ko
@@ -447,20 +335,10 @@ msm_ext_display.ko
 sync_fence.ko
 msm_hw_fence.ko
 msm-mmrm.ko
-qcedev-mod_dlkm.ko
-qcrypto-msm_dlkm.ko
-qce50_dlkm.ko
-hdcp_qseecom_dlkm.ko
-qrng_dlkm.ko
-smmu_proxy_dlkm.ko
-smcinvoke_dlkm.ko
-tz_log_dlkm.ko
-qseecom_dlkm.ko
 spcom.ko
 spss_utils.ko
 synx-driver.ko
 ipclite.ko
 ipclite_test.ko
-ubwcp.ko
 msm_video.ko
 msm_kgsl.ko

proprietary-files.txt

@@ -2,18 +2,23 @@
 
 # ADSP
 vendor/bin/adsprpcd
+vendor/bin/audioadsprpcd
 vendor/bin/loadalgo
 vendor/etc/init/vendor.qti.adsprpc-guestos-service.rc
+vendor/etc/init/vendor.qti.audio-adsprpc-service.rc
 vendor/lib64/libadsp_default_listener.so
 vendor/lib64/libadsprpc.so
 vendor/lib64/libloadalgo_stub.so
 
+# ADSP modules
+vendor/lib/rfsa/adsp/libdsp_streamer_binning.so
+vendor/lib/rfsa/adsp/libhme_dsp_skel.so
+
 # Audio
-vendor/bin/audioadsprpcd
-vendor/etc/init/vendor.qti.audio-adsprpc-service.rc
-vendor/lib64/hw/android.hardware.bluetooth.audio-impl-qti.so
-vendor/lib64/hw/audio.bluetooth_qti.default.so
-vendor/lib64/hw/sound_trigger.primary.pineapple.so
+vendor/etc/audconf/OPEN/acdb_cal.acdb
+vendor/etc/audconf/OPEN/workspaceFileXml.qwsp
+vendor/etc/init/init.audio.samsung.rc
+vendor/lib64/hw/audio.primary.pineapple.so
 vendor/lib64/hw/[email protected]
 vendor/lib64/libPeripheralStateUtils.so
 vendor/lib64/libVoiceSdk.so
@@ -27,9 +32,6 @@ vendor/lib64/libar-pal.so;DISABLE_CHECKELF
 vendor/lib64/libarmemlog.so
 vendor/lib64/libats.so
 vendor/lib64/libaudio_log_utils.so
-vendor/lib64/libbluetooth_audio_session_aidl_qti.so
-vendor/lib64/libbluetooth_audio_session_qti.so
-vendor/lib64/libbluetooth_audio_session_qti_2_1.so
 vendor/lib64/libfloatingfeature.so
 vendor/lib64/liblistensoundmodel2vendor.so
 vendor/lib64/liblx-ar_util.so
@@ -47,8 +49,27 @@ vendor/lib64/[email protected]
 vendor/lib64/[email protected]
 vendor/lib64/[email protected]
 
+# Audio FX modules
+vendor/lib64/soundfx/libasphere.so
+vendor/lib64/soundfx/libquasar.so
+vendor/lib64/soundfx/libshoebox.so
+
 # Audio XML
+vendor/etc/audio/sku_pineapple/audio_effects.conf
+vendor/etc/audio/sku_pineapple/audio_effects.xml
+vendor/etc/audio/sku_pineapple/mixer_paths.xml
+vendor/etc/audio/sku_pineapple/mixer_paths_pineapple_cdp.xml
+vendor/etc/audio/sku_pineapple/mixer_paths_pineapple_cdp_wsa883x.xml
+vendor/etc/audio/sku_pineapple/mixer_paths_pineapple_mtp.xml
+vendor/etc/audio/sku_pineapple/mixer_paths_pineapple_qrd.xml
+vendor/etc/audio/sku_pineapple/mixer_paths_pineapple_qrd_sku2.xml
+vendor/etc/audio/sku_pineapple/resourcemanager.xml
+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/audio/sku_pineapple_qssi/audio_policy_configuration.xml
+vendor/etc/audio_effects.xml
 vendor/etc/audio_policy_configuration.xml
 vendor/etc/audio_policy_configuration_base.xml
 vendor/etc/audio_policy_volumes.xml
@@ -63,6 +84,39 @@ vendor/etc/r_submix_audio_policy_configuration.xml
 vendor/etc/situation_audio_policy_volumes_sec.xml
 vendor/etc/usb_audio_policy_configuration.xml
 
+# Bluetooth
+vendor/bin/hw/[email protected]
+vendor/etc/init/[email protected]
+vendor/etc/vintf/manifest/bttpi-saidl.xml
+vendor/lib64/hw/[email protected]
+vendor/lib64/hw/[email protected]
+vendor/lib64/hw/audio.bluetooth_qti.default.so
+vendor/lib64/hw/vendor.qti.hardware.bttpi-impl.so
+vendor/lib64/lib_bt_aptx.so
+vendor/lib64/lib_bt_ble.so
+vendor/lib64/lib_bt_bundle.so
+vendor/lib64/libbtnv.so
+vendor/lib64/libsoc_helper.so
+vendor/lib64/vendor.samsung.hardware.bluetooth.audio-V2-ndk.so
+vendor/lib64/[email protected]
+
+# Bluetooth (A2DP)
+vendor/lib64/btaudio_offload_if.so
+vendor/lib64/hw/android.hardware.bluetooth.audio-impl-qti.so
+vendor/lib64/hw/[email protected]
+vendor/lib64/hw/[email protected]
+vendor/lib64/hw/[email protected]
+vendor/lib64/hw/[email protected]
+vendor/lib64/hw/[email protected]
+vendor/lib64/libbluetooth_audio_session_aidl_qti.so
+vendor/lib64/libbluetooth_audio_session_qti.so
+vendor/lib64/libbluetooth_audio_session_qti_2_1.so
+vendor/lib64/libbt-hidlclient.so
+vendor/lib64/libsehbluetooth_audio_session_aidl.so
+vendor/lib64/[email protected]
+vendor/lib64/[email protected]
+vendor/lib64/[email protected]
+
 # Camera firmware
 vendor/firmware/CAMERA_ICP.b00
 vendor/firmware/CAMERA_ICP.b01
@@ -169,7 +223,12 @@ vendor/lib64/libxml.so
 vendor/lib64/vendor.qti.hardware.radio.atfwd-V1-ndk.so
 
 # Diag
+vendor/bin/diag-router
+vendor/etc/init/vendor.qti.diag.rc
+vendor/etc/vintf/manifest/vendor.qti.diag.hal.service.xml
 vendor/lib64/libdiag.so
+vendor/lib64/libqsocket.so
+vendor/lib64/[email protected]
 
 # Display
 vendor/bin/qdcmss
@@ -247,7 +306,6 @@ vendor/lib64/[email protected]
 system_ext/etc/dpm/dpm.conf
 vendor/etc/init/dpmQmiMgr.rc
 vendor/lib64/[email protected]
-vendor/lib64/[email protected]
 vendor/lib64/vendor.qti.hardware.dpmaidlservice-V1-ndk.so
 vendor/lib64/[email protected]
 vendor/lib64/[email protected]
@@ -561,15 +619,16 @@ vendor/lib64/libqti-perfd.so
 vendor/lib64/libqti-util.so
 vendor/lib64/vendor.qti.hardware.perf2-V1-ndk.so
 
+# PD
+vendor/bin/pd-mapper
+vendor/lib64/libpdmapper.so
+vendor/lib64/libpdnotifier.so
+
 # Peripheral manager
 vendor/bin/pm-proxy
 vendor/bin/pm-service
 vendor/lib64/libperipheral_client.so
 
-# PD
-vendor/lib64/libpdmapper.so
-vendor/lib64/libpdnotifier.so
-
 # Protobuf
 vendor/lib64/libprotobuf-cpp-full-21.7.so
 vendor/lib64/libprotobuf-cpp-lite-21.7.so
@@ -609,6 +668,7 @@ vendor/lib64/libqmi_csi.so
 vendor/lib64/libqmi_encdec.so
 vendor/lib64/libqmiservices.so
 vendor/lib64/libqrtr.so
+vendor/lib64/libqsh.so
 
 # Remoteproc
 vendor/bin/rmt_storage
@@ -671,6 +731,26 @@ vendor/lib64/libminkdescriptor.so
 vendor/lib64/libminksocket_vendor.so
 vendor/lib64/libqcbor.so
 
+# Sensors
+vendor/bin/init.qcom.sensors.sh
+vendor/bin/sensors.qti
+vendor/bin/sscrpcd
+vendor/etc/init/init.vendor.sensors.rc
+vendor/etc/init/vendor.sensors.qti.rc
+vendor/etc/init/vendor.sensors.sscrpcd.rc
+vendor/lib64/libnanopb.so
+vendor/lib64/libsensorslog.so
+vendor/lib64/libsns_api.so
+vendor/lib64/libsns_device_mode_stub.so
+vendor/lib64/libsns_direct_channel_stub.so
+vendor/lib64/libsns_dynamic_loader_stub.so
+vendor/lib64/libsns_registry_skel.so
+vendor/lib64/libsns_remote_proc_state_stub.so
+vendor/lib64/libsnsapi.so
+vendor/lib64/libsnsdiaglog.so
+vendor/lib64/libsnsutils.so
+vendor/lib64/libssc_default_listener.so
+
 # TEE
 vendor/lib64/libGPMTEEC_vendor.so
 vendor/lib64/libGPTEE_vendor.so
@@ -681,6 +761,7 @@ vendor/lib64/[email protected]
 vendor/bin/hw/vendor.samsung.hardware.thermal-service
 vendor/etc/btcon.json
 vendor/etc/display/thermallevel_to_fps.xml
+vendor/etc/hqm_device.xml
 vendor/etc/init/vendor.samsung.hardware.thermal-default.rc
 vendor/etc/mercury.json
 vendor/etc/mercury_hv.json