Revert "hal: configs: effects: Enable treble feature"
This reverts commit
cab4a7d4333b75f403ea39f9a2b498f6622c5bab.
Change-Id: Ic8a6827e5719b469dbd73af5934b9998d53c42c0
diff --git a/hal/Android.mk b/hal/Android.mk
index a348200..0169819 100644
--- a/hal/Android.mk
+++ b/hal/Android.mk
@@ -375,14 +375,10 @@
LOCAL_MODULE := audio.primary.$(TARGET_BOARD_PLATFORM)
-LOCAL_MODULE_OWNER := qti
-
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_MODULE_TAGS := optional
-LOCAL_PROPRIETARY_MODULE := true
-
include $(BUILD_SHARED_LIBRARY)
endif
diff --git a/hal/acdb.h b/hal/acdb.h
index d1f863b..44a51ed 100644
--- a/hal/acdb.h
+++ b/hal/acdb.h
@@ -30,7 +30,7 @@
#ifdef LINUX_ENABLED
#define PLATFORM_INFO_XML_PATH "/etc/audio_platform_info.xml"
#else
-#define PLATFORM_INFO_XML_PATH "/vendor/etc/audio_platform_info.xml"
+#define PLATFORM_INFO_XML_PATH "/system/etc/audio_platform_info.xml"
#endif
/* Audio calibration related functions */
diff --git a/hal/audio_extn/ssr.c b/hal/audio_extn/ssr.c
index 65fe2b7..7467579 100644
--- a/hal/audio_extn/ssr.c
+++ b/hal/audio_extn/ssr.c
@@ -197,9 +197,9 @@
/* TO DO: different config files for different sample rates */
if (num_chan == 6) {
- cfgFileName = "/vendor/etc/drc/drc_cfg_5.1.txt";
+ cfgFileName = "/system/etc/drc/drc_cfg_5.1.txt";
} else if (num_chan == 2) {
- cfgFileName = "/vendor/etc/drc/drc_cfg_AZ.txt";
+ cfgFileName = "/system/etc/drc/drc_cfg_AZ.txt";
}
ALOGV("%s: Calling drc_init: num ch: %d, period: %d, cfg file: %s", __func__, num_chan, SSR_PERIOD_SIZE, cfgFileName);
@@ -278,9 +278,9 @@
ssrmod.num_out_chan = num_out_chan;
if (num_out_chan == 6) {
- cfgFileName = "/vendor/etc/surround_sound_3mic/surround_sound_rec_5.1.cfg";
+ cfgFileName = "/system/etc/surround_sound_3mic/surround_sound_rec_5.1.cfg";
} else if (num_out_chan == 2) {
- cfgFileName = "/vendor/etc/surround_sound_3mic/surround_sound_rec_AZ.cfg";
+ cfgFileName = "/system/etc/surround_sound_3mic/surround_sound_rec_AZ.cfg";
} else {
ALOGE("%s: No cfg file for num_out_chan: %d", __func__, num_out_chan);
}
@@ -552,16 +552,16 @@
otherwise, fopen may fail */
if ( !ssrmod.fp_input) {
ALOGD("%s: Opening ssr input dump file \n", __func__);
- ssrmod.fp_input = fopen("/data/vendor/misc/audio/ssr_input_3ch.pcm", "wb");
+ ssrmod.fp_input = fopen("/data/misc/audio/ssr_input_3ch.pcm", "wb");
}
if ( !ssrmod.fp_output) {
if(ssrmod.num_out_chan == 6) {
ALOGD("%s: Opening ssr input dump file for 6 channel\n", __func__);
- ssrmod.fp_output = fopen("/data/vendor/misc/audio/ssr_output_6ch.pcm", "wb");
+ ssrmod.fp_output = fopen("/data/misc/audio/ssr_output_6ch.pcm", "wb");
} else {
ALOGD("%s: Opening ssr input dump file for 2 channel\n", __func__);
- ssrmod.fp_output = fopen("/data/vendor/misc/audio/ssr_output_2ch.pcm", "wb");
+ ssrmod.fp_output = fopen("/data/misc/audio/ssr_output_2ch.pcm", "wb");
}
}
diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c
index c20cd3d..3c3c717 100644
--- a/hal/msm8916/platform.c
+++ b/hal/msm8916/platform.c
@@ -48,27 +48,27 @@
#define SOUND_TRIGGER_DEVICE_HANDSET_MONO_LOW_POWER_ACDB_ID (100)
#define MAX_MIXER_XML_PATH 100
-#define MIXER_XML_PATH_QRD_SKUH "/vendor/etc/mixer_paths_qrd_skuh.xml"
-#define MIXER_XML_PATH_QRD_SKUI "/vendor/etc/mixer_paths_qrd_skui.xml"
-#define MIXER_XML_PATH_QRD_SKUHF "/vendor/etc/mixer_paths_qrd_skuhf.xml"
-#define MIXER_XML_PATH_SKUK "/vendor/etc/mixer_paths_skuk.xml"
-#define MIXER_XML_PATH_SKUA "/vendor/etc/mixer_paths_skua.xml"
-#define MIXER_XML_PATH_SKUC "/vendor/etc/mixer_paths_skuc.xml"
-#define MIXER_XML_PATH_SKUE "/vendor/etc/mixer_paths_skue.xml"
-#define MIXER_XML_PATH_SKUL "/vendor/etc/mixer_paths_skul.xml"
-#define MIXER_XML_PATH_SKUS "/vendor/etc/mixer_paths_skus.xml"
-#define MIXER_XML_PATH_SKUSH "/vendor/etc/mixer_paths_skush.xml"
-#define MIXER_XML_PATH_QRD_SKUT "/vendor/etc/mixer_paths_qrd_skut.xml"
-#define MIXER_XML_PATH_SKUM "/vendor/etc/mixer_paths_qrd_skum.xml"
-#define MIXER_XML_PATH_SKU1 "/vendor/etc/mixer_paths_qrd_sku1.xml"
-#define MIXER_XML_PATH_SKUN_CAJON "/vendor/etc/mixer_paths_qrd_skun_cajon.xml"
-#define MIXER_XML_PATH_SKU3 "/vendor/etc/mixer_paths_qrd_sku3.xml"
-#define MIXER_XML_PATH_AUXPCM "/vendor/etc/mixer_paths_auxpcm.xml"
-#define MIXER_XML_PATH_AUXPCM "/vendor/etc/mixer_paths_auxpcm.xml"
-#define MIXER_XML_PATH_I2S "/vendor/etc/mixer_paths_i2s.xml"
-#define MIXER_XML_PATH_WCD9306 "/vendor/etc/mixer_paths_wcd9306.xml"
-#define MIXER_XML_PATH_WCD9330 "/vendor/etc/mixer_paths_wcd9330.xml"
-#define MIXER_XML_PATH_WCD9340 "/vendor/etc/mixer_paths_wcd9340.xml"
+#define MIXER_XML_PATH_QRD_SKUH "/system/etc/mixer_paths_qrd_skuh.xml"
+#define MIXER_XML_PATH_QRD_SKUI "/system/etc/mixer_paths_qrd_skui.xml"
+#define MIXER_XML_PATH_QRD_SKUHF "/system/etc/mixer_paths_qrd_skuhf.xml"
+#define MIXER_XML_PATH_SKUK "/system/etc/mixer_paths_skuk.xml"
+#define MIXER_XML_PATH_SKUA "/system/etc/mixer_paths_skua.xml"
+#define MIXER_XML_PATH_SKUC "/system/etc/mixer_paths_skuc.xml"
+#define MIXER_XML_PATH_SKUE "/system/etc/mixer_paths_skue.xml"
+#define MIXER_XML_PATH_SKUL "/system/etc/mixer_paths_skul.xml"
+#define MIXER_XML_PATH_SKUS "/system/etc/mixer_paths_skus.xml"
+#define MIXER_XML_PATH_SKUSH "/system/etc/mixer_paths_skush.xml"
+#define MIXER_XML_PATH_QRD_SKUT "/system/etc/mixer_paths_qrd_skut.xml"
+#define MIXER_XML_PATH_SKUM "/system/etc/mixer_paths_qrd_skum.xml"
+#define MIXER_XML_PATH_SKU1 "/system/etc/mixer_paths_qrd_sku1.xml"
+#define MIXER_XML_PATH_SKUN_CAJON "/system/etc/mixer_paths_qrd_skun_cajon.xml"
+#define MIXER_XML_PATH_SKU3 "/system/etc/mixer_paths_qrd_sku3.xml"
+#define MIXER_XML_PATH_AUXPCM "/system/etc/mixer_paths_auxpcm.xml"
+#define MIXER_XML_PATH_AUXPCM "/system/etc/mixer_paths_auxpcm.xml"
+#define MIXER_XML_PATH_I2S "/system/etc/mixer_paths_i2s.xml"
+#define MIXER_XML_PATH_WCD9306 "/system/etc/mixer_paths_wcd9306.xml"
+#define MIXER_XML_PATH_WCD9330 "/system/etc/mixer_paths_wcd9330.xml"
+#define MIXER_XML_PATH_WCD9340 "/system/etc/mixer_paths_wcd9340.xml"
#ifdef LINUX_ENABLED
/* For LE platforms */
#define MIXER_XML_PATH "/etc/mixer_paths.xml"
@@ -85,22 +85,22 @@
#define MIXER_XML_PATH_WCD9335_I2S "/etc/mixer_paths_wcd9335_i2s.xml"
#define MIXER_XML_PATH_SBC "/etc/mixer_paths_sbc.xml"
#else
-#define MIXER_XML_PATH "/vendor/etc/mixer_paths.xml"
-#define MIXER_XML_PATH_MSM8909_PM8916 "/vendor/etc/mixer_paths_msm8909_pm8916.xml"
-#define MIXER_XML_PATH_MTP "/vendor/etc/mixer_paths_mtp.xml"
-#define MIXER_XML_PATH_SKU2 "/vendor/etc/mixer_paths_qrd_sku2.xml"
-#define PLATFORM_INFO_XML_PATH_EXTCODEC "/vendor/etc/audio_platform_info_extcodec.xml"
-#define PLATFORM_INFO_XML_PATH_SKUSH "/vendor/etc/audio_platform_info_skush.xml"
-#define MIXER_XML_PATH_WCD9326 "/vendor/etc/mixer_paths_wcd9326.xml"
-#define MIXER_XML_PATH_WCD9335 "/vendor/etc/mixer_paths_wcd9335.xml"
-#define MIXER_XML_PATH_SKUN "/vendor/etc/mixer_paths_qrd_skun.xml"
-#define PLATFORM_INFO_XML_PATH "/vendor/etc/audio_platform_info.xml"
-#define MIXER_XML_PATH_WCD9326_I2S "/vendor/etc/mixer_paths_wcd9326_i2s.xml"
-#define MIXER_XML_PATH_WCD9330_I2S "/vendor/etc/mixer_paths_wcd9330_i2s.xml"
-#define MIXER_XML_PATH_WCD9335_I2S "/vendor/etc/mixer_paths_wcd9335_i2s.xml"
-#define MIXER_XML_PATH_SBC "/vendor/etc/mixer_paths_sbc.xml"
+#define MIXER_XML_PATH "/system/etc/mixer_paths.xml"
+#define MIXER_XML_PATH_MSM8909_PM8916 "/system/etc/mixer_paths_msm8909_pm8916.xml"
+#define MIXER_XML_PATH_MTP "/system/etc/mixer_paths_mtp.xml"
+#define MIXER_XML_PATH_SKU2 "/system/etc/mixer_paths_qrd_sku2.xml"
+#define PLATFORM_INFO_XML_PATH_EXTCODEC "/system/etc/audio_platform_info_extcodec.xml"
+#define PLATFORM_INFO_XML_PATH_SKUSH "/system/etc/audio_platform_info_skush.xml"
+#define MIXER_XML_PATH_WCD9326 "/system/etc/mixer_paths_wcd9326.xml"
+#define MIXER_XML_PATH_WCD9335 "/system/etc/mixer_paths_wcd9335.xml"
+#define MIXER_XML_PATH_SKUN "/system/etc/mixer_paths_qrd_skun.xml"
+#define PLATFORM_INFO_XML_PATH "/system/etc/audio_platform_info.xml"
+#define MIXER_XML_PATH_WCD9326_I2S "/system/etc/mixer_paths_wcd9326_i2s.xml"
+#define MIXER_XML_PATH_WCD9330_I2S "/system/etc/mixer_paths_wcd9330_i2s.xml"
+#define MIXER_XML_PATH_WCD9335_I2S "/system/etc/mixer_paths_wcd9335_i2s.xml"
+#define MIXER_XML_PATH_SBC "/system/etc/mixer_paths_sbc.xml"
#endif
-#define MIXER_XML_PATH_SKUN "/vendor/etc/mixer_paths_qrd_skun.xml"
+#define MIXER_XML_PATH_SKUN "/system/etc/mixer_paths_qrd_skun.xml"
#define LIB_ACDB_LOADER "libacdbloader.so"
#define CVD_VERSION_MIXER_CTL "CVD Version"
diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index f4d1b03..0b0dd92 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -62,12 +62,12 @@
#define MIXER_XML_PATH_I2S "/etc/mixer_paths_i2s.xml"
#define PLATFORM_INFO_XML_PATH_I2S "/etc/audio_platform_info_i2s.xml"
#else
-#define MIXER_XML_BASE_STRING "/vendor/etc/mixer_paths"
-#define MIXER_XML_DEFAULT_PATH "/vendor/etc/mixer_paths.xml"
-#define PLATFORM_INFO_XML_PATH "/vendor/etc/audio_platform_info.xml"
-#define MIXER_XML_PATH_AUXPCM "/vendor/etc/mixer_paths_auxpcm.xml"
-#define MIXER_XML_PATH_I2S "/vendor/etc/mixer_paths_i2s.xml"
-#define PLATFORM_INFO_XML_PATH_I2S "/vendor/etc/audio_platform_info_i2s.xml"
+#define MIXER_XML_BASE_STRING "/system/etc/mixer_paths"
+#define MIXER_XML_DEFAULT_PATH "/system/etc/mixer_paths.xml"
+#define PLATFORM_INFO_XML_PATH "/system/etc/audio_platform_info.xml"
+#define MIXER_XML_PATH_AUXPCM "/system/etc/mixer_paths_auxpcm.xml"
+#define MIXER_XML_PATH_I2S "/system/etc/mixer_paths_i2s.xml"
+#define PLATFORM_INFO_XML_PATH_I2S "/system/etc/audio_platform_info_i2s.xml"
#endif
#include <linux/msm_audio.h>