shinano-common: Ship stock audio HAL

Change-Id: I17136742a4dcc58834e921146fc1da8aa41f903c

6 files changed, 21 insertions, 90 deletions

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index c93762c..bc11a41 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -26,19 +26,6 @@ PRODUCT_PLATFORM := shinano
 BOARD_KERNEL_CMDLINE := androidboot.hardware=qcom msm_rtb.filter=0x37 ehci-hcd.park=3 dwc3.maximum_speed=high dwc3_msm.prop_chg_detect=Y vmalloc=300M
 
 # Audio
-AUDIO_FEATURE_DISABLED_FM_VIRTUAL_RECORD := true
-AUDIO_FEATURE_ENABLED_ANC_HEADSET := true
-AUDIO_FEATURE_ENABLED_AUXPCM_BT := true
-AUDIO_FEATURE_ENABLED_EXTN_FORMATS := true
-AUDIO_FEATURE_ENABLED_FLUENCE := true
-AUDIO_FEATURE_ENABLED_HFP := true
-AUDIO_FEATURE_ENABLED_HWDEP_CAL := true
-AUDIO_FEATURE_ENABLED_MULTI_VOICE_SESSIONS := true
-AUDIO_FEATURE_ENABLED_MULTIPLE_TUNNEL := true
-AUDIO_FEATURE_ENABLED_NEW_SAMPLE_RATE = true
-AUDIO_FEATURE_ENABLED_PROXY_DEVICE := true
-AUDIO_FEATURE_LOW_LATENCY_PRIMARY := true
-
 USE_CUSTOM_AUDIO_POLICY := 1
 USE_XML_AUDIO_POLICY_CONF := 1
 
diff --git a/configs/audio/audio_platform_info.xml b/configs/audio/audio_platform_info.xml
deleted file mode 100644
index 0d94ddc..0000000
--- a/configs/audio/audio_platform_info.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (c) 2014, The Linux Foundation. All rights reserved.         -->
-<!--                                                                        -->
-<!-- Redistribution and use in source and binary forms, with or without     -->
-<!-- modification, are permitted provided that the following conditions are -->
-<!-- met:                                                                   -->
-<!--     * Redistributions of source code must retain the above copyright   -->
-<!--       notice, this list of conditions and the following disclaimer.    -->
-<!--     * Redistributions in binary form must reproduce the above          -->
-<!--       copyright notice, this list of conditions and the following      -->
-<!--       disclaimer in the documentation and/or other materials provided  -->
-<!--       with the distribution.                                           -->
-<!--     * Neither the name of The Linux Foundation nor the names of its    -->
-<!--       contributors may be used to endorse or promote products derived  -->
-<!--       from this software without specific prior written permission.    -->
-<!--                                                                        -->
-<!-- THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED           -->
-<!-- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF   -->
-<!-- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT -->
-<!-- ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS -->
-<!-- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -->
-<!-- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF   -->
-<!-- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR        -->
-<!-- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,  -->
-<!-- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -->
-<!-- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.                          -->
-<audio_platform_info>
-    <acdb_ids>
-        <!-- Output devices -->
-        <device name="SND_DEVICE_OUT_SPEAKER" acdb_id="15" />
-        <device name="SND_DEVICE_OUT_SPEAKER_REVERSE" acdb_id="15" />
-        <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES" acdb_id="15" />
-        <device name="SND_DEVICE_OUT_VOICE_SPEAKER" acdb_id="15" />
-        <device name="SND_DEVICE_OUT_SPEAKER_AND_HDMI" acdb_id="15" />
-        <device name="SND_DEVICE_OUT_SPEAKER_AND_USB_HEADSET" acdb_id="15" />
-
-        <!-- Input devices -->
-        <device name="SND_DEVICE_IN_HANDSET_DMIC" acdb_id="6" />
-        <device name="SND_DEVICE_IN_VOICE_DMIC" acdb_id="6" />
-        <device name="SND_DEVICE_IN_VOICE_REC_DMIC_FLUENCE" acdb_id="6" />
-        <device name="SND_DEVICE_IN_BT_SCO_MIC" acdb_id="282" />
-        <device name="SND_DEVICE_IN_CAMCORDER_MIC" acdb_id="544" />
-        <device name="SND_DEVICE_IN_VOICE_REC_MIC" acdb_id="528" />
-    </acdb_ids>
-
-    <backend_names>
-        <!-- Output devices -->
-        <device name="SND_DEVICE_OUT_HANDSET" backend="handset" />
-        <device name="SND_DEVICE_OUT_SPEAKER" backend="speaker" />
-        <device name="SND_DEVICE_OUT_SPEAKER_REVERSE" backend="speaker" />
-        <device name="SND_DEVICE_OUT_SPEAKER_PROTECTED" backend="speaker" />
-        <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES" backend="speaker-and-headphones" />
-        <device name="SND_DEVICE_OUT_VOICE_HANDSET" backend="handset" />
-        <device name="SND_DEVICE_OUT_VOICE_SPEAKER" backend="speaker" />
-        <device name="SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET" backend="handset" />
-        <device name="SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET" backend="speaker-anc-nc-headphone" />
-    </backend_names>
-
-    <device_names>
-        <!-- Output devices -->
-        <device name="SND_DEVICE_OUT_HEADPHONES" alias="headphones-regulation" />
-        <device name="SND_DEVICE_OUT_VOICE_HAC_HANDSET" alias="voice-handset-hac" />
-
-      <!-- Input devices -->
-        <device name="SND_DEVICE_IN_BT_SCO_MIC" alias="bt-sco-dsp-mic" />
-        <device name="SND_DEVICE_IN_HDMI_MIC" alias="hdmi-tx" />
-    </device_names>
-</audio_platform_info>
diff --git a/extract-files.sh b/extract-files.sh
index 398fccb..55de6d3 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -23,15 +23,21 @@ function blob_fixup() {
     lib/libcameralight.so)
         sed -i "s|/system/etc/flashled_calc_parameters.cfg|/vendor/etc/flashled_calc_parameters.cfg|g" "${2}"
         ;;
-    vendor/lib/libdsi_netctrl.so)
-        sed -i "s|/system/etc/data/dsi_config.xml|/vendor/etc/data/dsi_config.xml|g" "${2}"
-        ;;
     vendor/bin/netmgrd)
         sed -i "s|/system/etc/data/netmgr_config.xml|/vendor/etc/data/netmgr_config.xml|g" "${2}"
         ;;
     vendor/bin/qmuxd)
         sed -i "s|/system/etc/data/qmi_config.xml|/vendor/etc/data/qmi_config.xml|g" "${2}"
         ;;
+    vendor/lib/hw/audio.primary.msm8974.so)
+        sed -i "s|/system/etc/mixer_paths.xml|/vendor/etc/mixer_paths.xml|g" "${2}"
+        ;;
+    vendor/lib/libaudioroute.so)
+        sed -i "s|/system/etc/mixer_paths.xml|/vendor/etc/mixer_paths.xml|g" "${2}"
+        ;;
+    vendor/lib/libdsi_netctrl.so)
+        sed -i "s|/system/etc/data/dsi_config.xml|/vendor/etc/data/dsi_config.xml|g" "${2}"
+        ;;
     esac
 }
 
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 02e626a..80c79c6 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -8,11 +8,17 @@ vendor/lib/libfastcvopt.so
 etc/ad_calib.cfg:vendor/etc/ad_calib.cfg
 
 # Audio
+lib/soundfx/libsonypostprocbundle.so:vendor/lib/soundfx/libsonypostprocbundle.so
+lib/soundfx/libsonysweffect.so:vendor/lib/soundfx/libsonysweffect.so
 vendor/lib/libacdbloader.so
 vendor/lib/libacdbrtac.so
 vendor/lib/libadiertac.so
 vendor/lib/libaudcal.so
 
+# Audio HAL
+lib/hw/audio.primary.msm8974.so:vendor/lib/hw/audio.primary.msm8974.so
+lib/libaudioroute.so:vendor/lib/libaudioroute.so
+
 # Bluetooth aptX - from Motorola Moto Z NCLS25.86-11-4-6-5
 vendor/lib/libaptX_encoder.so|b03772672144d4b750a5672c2922aded93bb0512
 
diff --git a/shinano.mk b/shinano.mk
index d05ed63..7fb7b08 100644
--- a/shinano.mk
+++ b/shinano.mk
@@ -29,7 +29,6 @@ PRODUCT_COPY_FILES += \
 
 # Audio
 PRODUCT_COPY_FILES += \
-    $(COMMON_PATH)/configs/audio/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml \
     $(COMMON_PATH)/configs/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml
 
 PRODUCT_COPY_FILES += \
diff --git a/system_prop.mk b/system_prop.mk
index bf992bf..386b800 100644
--- a/system_prop.mk
+++ b/system_prop.mk
@@ -39,11 +39,12 @@ PRODUCT_PROPERTY_OVERRIDES += \
 
 # Audio HAL
 PRODUCT_PROPERTY_OVERRIDES += \
-    persist.vendor.audio.fluence.audiorec=true \
-    persist.vendor.audio.fluence.speaker=false \
-    persist.vendor.audio.fluence.voicecall=true \
-    persist.vendor.audio.fluence.voicerec=false \
-    ro.vendor.audio.sdk.fluencetype=fluence
+    persist.audio.fluence.audiorec=true \
+    persist.audio.fluence.speaker=true \
+    persist.audio.fluence.voicecall=true \
+    persist.audio.fluence.voicerec=false \
+    ro.qc.sdk.audio.ssr=false \
+    ro.qc.sdk.audio.fluencetype=none
 
 # Bluetooth
 PRODUCT_PROPERTY_OVERRIDES += \