gts3l-common: audio: Use vendor HAL for quad-speakers

But the speakers not working yet

Signed-off-by: Deokgyu Yang <secugyu@gmail.com>
Change-Id: Ib621378155fc68a975bb40c993f2aa65e0ee993b

BoardConfigCommon.mk

@@ -63,41 +63,10 @@ TARGET_BOARD_PLATFORM_GPU := qcom-adreno530
 BOARD_ANT_WIRELESS_DEVICE := "qualcomm-hidl"
 
 # Audio
-AUDIO_FEATURE_ENABLED_A2DP_OFFLOAD := true
-AUDIO_FEATURE_ENABLED_ACDB_LICENSE := true
-AUDIO_FEATURE_ENABLED_ALAC_OFFLOAD := true
-AUDIO_FEATURE_ENABLED_ANC_HEADSET := true
-AUDIO_FEATURE_ENABLED_APE_OFFLOAD := true
 AUDIO_FEATURE_ENABLED_AUDIOSPHERE := true
-AUDIO_FEATURE_ENABLED_COMPRESS_VOIP := true
+AUDIO_FEATURE_ENABLED_INSTANCE_ID := true
-AUDIO_FEATURE_ENABLED_CUSTOMSTEREO := true
-AUDIO_FEATURE_ENABLED_DEV_ARBI := true
-AUDIO_FEATURE_ENABLED_DS2_DOLBY_DAP := false
-AUDIO_FEATURE_ENABLED_DTS_EAGLE := false
-AUDIO_FEATURE_ENABLED_DYNAMIC_ECNS := false
-AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT := true
-AUDIO_FEATURE_ENABLED_EXTN_FORMATS := true
-AUDIO_FEATURE_ENABLED_FFV := false
-AUDIO_FEATURE_ENABLED_FLAC_OFFLOAD := true
-AUDIO_FEATURE_ENABLED_FLUENCE := true
-AUDIO_FEATURE_ENABLED_HW_ACCELERATED_EFFECTS := false
-AUDIO_FEATURE_ENABLED_KEEP_ALIVE_ARM_FFV := false
-AUDIO_FEATURE_ENABLED_KPI_OPTIMIZE := true
-AUDIO_FEATURE_ENABLED_MULTI_VOICE_SESSIONS := true
-AUDIO_FEATURE_ENABLED_NT_PAUSE_TIMEOUT := true
-AUDIO_FEATURE_ENABLED_PCM_OFFLOAD := true
-AUDIO_FEATURE_ENABLED_PCM_OFFLOAD_24 := true
 AUDIO_FEATURE_ENABLED_PROXY_DEVICE := true
-AUDIO_FEATURE_ENABLED_RECORD_PLAY_CONCURRENCY := true
-AUDIO_FEATURE_ENABLED_SND_MONITOR := true
-AUDIO_FEATURE_ENABLED_VBAT_MONITOR := true
-AUDIO_FEATURE_ENABLED_VOICE_CONCURRENCY :=true
-AUDIO_FEATURE_ENABLED_VORBIS_OFFLOAD := true
-AUDIO_USE_LL_AS_PRIMARY_OUTPUT := true
-BOARD_SUPPORTS_SOUND_TRIGGER := false
-BOARD_USES_ALSA_AUDIO := true
 USE_CUSTOM_AUDIO_POLICY := 1
-USE_XML_AUDIO_POLICY_CONF := 1
 
 # Bluetooth
 BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(COMMON_PATH)/bluetooth
@@ -208,7 +177,8 @@ SELINUX_IGNORE_NEVERALLOWS := true
 # Shims
 TARGET_LD_SHIM_LIBS := \
     /vendor/lib/libbauthserver.so|libbauthtzcommon_shim.so \
-    /vendor/lib64/libbauthserver.so|libbauthtzcommon_shim.so
+    /vendor/lib64/libbauthserver.so|libbauthtzcommon_shim.so \
+    /vendor/lib/hw/audio.primary.msm8996.so|libaudioprimary_shim.so
 
 # Wifi
 BOARD_HAVE_SAMSUNG_WIFI := true

gts3l.mk

@@ -83,16 +83,16 @@ PRODUCT_PACKAGES += \
 
 # Audio
 PRODUCT_PACKAGES += \
-    android.hardware.audio@6.0 \
+    android.hardware.audio@2.0-impl \
-    android.hardware.audio@6.0-impl \
+    android.hardware.audio@4.0-impl \
-    android.hardware.audio.common@6.0 \
+    android.hardware.audio.effect@2.0-impl \
-    android.hardware.audio.common@6.0-util \
+    android.hardware.audio.effect@4.0-impl \
-    android.hardware.audio.effect@6.0 \
-    android.hardware.audio.effect@6.0-impl \
     android.hardware.audio.service \
     android.hardware.bluetooth.audio@2.0-impl \
+    android.hardware.soundtrigger@2.0-impl:32 \
+    android.hardware.soundtrigger@2.1-impl \
     audio.bluetooth.default \
-    audio.primary.msm8996 \
+    audio.primary.msm8996:32 \
     audio.r_submix.default \
     audio.usb.default \
     libaacwrapper \
@@ -102,7 +102,8 @@ PRODUCT_PACKAGES += \
     libqcomvisualizer \
     libqcomvoiceprocessing \
     libvolumelistener \
-    tinymix
+    tinymix \
+    libaudioprimary_shim
 
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/audio/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \
@@ -110,11 +111,8 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/audio/audio_output_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_output_policy.conf \
     $(LOCAL_PATH)/audio/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml \
     $(LOCAL_PATH)/audio/audio_platform_info_diff.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_diff.xml \
-    $(LOCAL_PATH)/audio/audio_platform_info_i2s.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_i2s.xml \
     $(LOCAL_PATH)/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
-    $(LOCAL_PATH)/audio/listen_platform_info.xml:system/etc/listen_platform_info.xml \
     $(LOCAL_PATH)/audio/mixer_paths_tasha.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_tasha.xml \
-    $(LOCAL_PATH)/audio/mixer_paths_i2s.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_i2s.xml
 
 PRODUCT_COPY_FILES += \
     frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \

manifest.xml

@@ -2,7 +2,7 @@
     <hal format="hidl">
         <name>android.hardware.audio</name>
         <transport>hwbinder</transport>
-        <version>6.0</version>
+        <version>4.0</version>
         <interface>
             <name>IDevicesFactory</name>
             <instance>default</instance>
@@ -11,7 +11,7 @@
     <hal format="hidl">
         <name>android.hardware.audio.effect</name>
         <transport>hwbinder</transport>
-        <version>6.0</version>
+        <version>4.0</version>
         <interface>
             <name>IEffectsFactory</name>
             <instance>default</instance>

proprietary-files.txt

@@ -18,6 +18,16 @@ vendor/lib/hw/com.qualcomm.qti.ant@1.0-impl.so
 vendor/lib64/hw/com.qualcomm.qti.ant@1.0-impl.so
 
 # Audio
+lib/librecordalive.so
+lib/libSamsungPostProcess.so
+lib/libSamsungPostProcessConvertor.so
+lib/libsamsungVoipResampler.so
+lib/lib_SamsungRec_06002.so
+lib/lib_SoundAlive_SRC384_ver320.so
+lib/lib_soundaliveresampler.so
+lib/lib_SoundBooster_ver_Quad_710.so
+vendor/etc/SoundBoosterParam.txt
+vendor/lib/hw/audio.primary.msm8996.so
 vendor/lib/libacdb-fts.so
 vendor/lib/libacdbloader.so
 vendor/lib/libacdbrtac.so
@@ -28,6 +38,8 @@ vendor/lib/libaudioalsa.so
 vendor/lib/libaudio_log_utils.so
 vendor/lib/libaudio_soundtrigger.so
 vendor/lib/libqtigef.so
+vendor/lib/libsamsungSoundbooster_plus.so
+vendor/lib/libsecaudioinfo.so
 vendor/lib/libsurround_3mic_proc.so
 vendor/lib/libtinycompress_vendor.so
 vendor/lib64/libacdb-fts.so

system.prop

@@ -1,41 +1,31 @@
 # Audio
 af.fast_track_multiplier=1
-audio.offload.video=true
 audio.deep_buffer.media=true
-ro.af.client_heap_size_kbyte=7168
+audio.offload.video=true
-ro.audio.monitorRotation=true
+persist.vendor.audio.fluence.speaker=true
-ro.config.media_vol_steps=25
-ro.vendor.audio.sdk.fluencetype=none
-ro.vendor.audio.sdk.ssr=false
 persist.vendor.audio.fluence.voicecall=true
 persist.vendor.audio.fluence.voicerec=false
-persist.vendor.audio.fluence.speaker=true
 persist.vendor.audio.hw.binder.size_kbyte=1024
-vendor.audio.feature.a2dp_offload.enable=true
+ro.af.client_heap_size_kbyte=7168
-vendor.audio.feature.anc_headset.enable=true
+ro.config.media_vol_steps=25
-vendor.audio.feature.afe_proxy.enable=true
+ro.config.vc_call_vol_steps=5
-vendor.audio.feature.custom_stereo.enable=true
+ro.vendor.audio.sdk.fluencetype=none
-vendor.audio.feature.kpi_optimize.enable=true
+ro.vendor.audio.sdk.ssr=false
-vendor.audio.feature.maxx_audio.enable=false
-vendor.audio.feature.multi_voice_session.enable=true
-vendor.audio.feature.record_play_concurency.enable=false
-vendor.audio.feature.snd_mon.enable=true
-vendor.audio_hal.period_size=192
-vendor.audio.tunnel.encode=false
-vendor.audio.offload.buffer.size.kb=64
-vendor.audio.offload.track.enable=true
-vendor.audio.offload.multiaac.enable=true
 vendor.audio.dolby.ds2.enabled=false
 vendor.audio.dolby.ds2.hardbypass=false
+vendor.audio.flac.sw.decoder.24bit=true
+vendor.audio_hal.period_size=192
+vendor.audio.hw.aac.encoder=true
+vendor.audio.offload.buffer.size.kb=64
+vendor.audio.offload.gapless.enabled=true
+vendor.audio.offload.multiaac.enable=true
 vendor.audio.offload.multiple.enabled=false
 vendor.audio.offload.passthrough=false
-vendor.audio.offload.gapless.enabled=true
+vendor.audio.offload.track.enable=true
-vendor.audio.safx.pbe.enabled=true
 vendor.audio.parser.ip.buffer.size=262144
-vendor.audio.hw.aac.encoder=true
+vendor.audio.safx.pbe.enabled=true
+vendor.audio.tunnel.encode=false
 vendor.audio.use.sw.alac.decoder=true
-vendor.audio.use.sw.ape.decoder=true
-vendor.audio.flac.sw.decoder.24bit=true
 vendor.voice.path.for.pcm.voip=true
 
 # Bluetooth