From cab4a7d4333b75f403ea39f9a2b498f6622c5bab Mon Sep 17 00:00:00 2001 From: Naresh Tanniru Date: Mon, 5 Jun 2017 21:05:53 +0530 Subject: [PATCH] hal: configs: effects: Enable treble feature - All qcom proprietary modules should use /vendor path instead /system for treble compatibility - Modify configs and android makefiles accordingly Change-Id: I1a4db8c39b5e7585d1a4d60584d5b1672c9599ac --- configs/msm8998/msm8998.mk | 34 ++++++------ configs/sdm660/sdm660.mk | 42 +++++++-------- configs/sdm845/sdm845.mk | 20 +++---- hal/Android.mk | 4 ++ hal/acdb.h | 2 +- hal/audio_extn/ssr.c | 14 ++--- hal/msm8916/platform.c | 72 +++++++++++++------------- hal/msm8974/platform.c | 12 ++--- mm-audio/aenc-aac/qdsp6/Android.mk | 6 ++- mm-audio/aenc-amrnb/qdsp6/Android.mk | 6 ++- mm-audio/aenc-evrc/qdsp6/Android.mk | 6 ++- mm-audio/aenc-g711/qdsp6/Android.mk | 6 ++- mm-audio/aenc-qcelp13/qdsp6/Android.mk | 6 ++- post_proc/Android.mk | 8 ++- visualizer/Android.mk | 2 + voice_processing/Android.mk | 2 + 16 files changed, 133 insertions(+), 109 deletions(-) diff --git a/configs/msm8998/msm8998.mk b/configs/msm8998/msm8998.mk index 509d798f..524582ab 100644 --- a/configs/msm8998/msm8998.mk +++ b/configs/msm8998/msm8998.mk @@ -80,22 +80,22 @@ endif PRODUCT_COPY_FILES += \ hardware/qcom/audio/configs/msm8998/audio_output_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_output_policy.conf \ hardware/qcom/audio/configs/msm8998/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.conf \ - hardware/qcom/audio/configs/msm8998/mixer_paths.xml:system/etc/mixer_paths.xml \ - hardware/qcom/audio/configs/msm8998/mixer_paths_tasha.xml:system/etc/mixer_paths_tasha.xml \ - hardware/qcom/audio/configs/msm8998/mixer_paths_tavil.xml:system/etc/mixer_paths_tavil.xml \ - hardware/qcom/audio/configs/msm8998/mixer_paths_skuk.xml:system/etc/mixer_paths_skuk.xml \ - hardware/qcom/audio/configs/msm8998/mixer_paths_skuk.xml:system/etc/mixer_paths_qvr.xml \ - hardware/qcom/audio/configs/msm8998/mixer_paths_dtp.xml:system/etc/mixer_paths_dtp.xml \ - hardware/qcom/audio/configs/msm8998/mixer_paths_i2s.xml:system/etc/mixer_paths_i2s.xml \ - hardware/qcom/audio/configs/msm8998/audio_tuning_mixer.txt:system/etc/audio_tuning_mixer.txt \ - hardware/qcom/audio/configs/msm8998/audio_tuning_mixer_tavil.txt:system/etc/audio_tuning_mixer_tavil.txt \ - hardware/qcom/audio/configs/msm8998/audio_platform_info_i2s.xml:system/etc/audio_platform_info_i2s.xml \ - hardware/qcom/audio/configs/msm8998/sound_trigger_mixer_paths.xml:system/etc/sound_trigger_mixer_paths.xml \ - hardware/qcom/audio/configs/msm8998/sound_trigger_mixer_paths_wcd9330.xml:system/etc/sound_trigger_mixer_paths_wcd9330.xml \ - hardware/qcom/audio/configs/msm8998/sound_trigger_mixer_paths_wcd9340.xml:system/etc/sound_trigger_mixer_paths_wcd9340.xml \ - hardware/qcom/audio/configs/msm8998/sound_trigger_platform_info.xml:system/etc/sound_trigger_platform_info.xml \ - hardware/qcom/audio/configs/msm8998/graphite_ipc_platform_info.xml:system/etc/graphite_ipc_platform_info.xml \ - hardware/qcom/audio/configs/msm8998/audio_platform_info.xml:system/etc/audio_platform_info.xml + hardware/qcom/audio/configs/msm8998/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml \ + hardware/qcom/audio/configs/msm8998/mixer_paths_tasha.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_tasha.xml \ + hardware/qcom/audio/configs/msm8998/mixer_paths_tavil.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_tavil.xml \ + hardware/qcom/audio/configs/msm8998/mixer_paths_skuk.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_skuk.xml \ + hardware/qcom/audio/configs/msm8998/mixer_paths_skuk.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_qvr.xml \ + hardware/qcom/audio/configs/msm8998/mixer_paths_dtp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_dtp.xml \ + hardware/qcom/audio/configs/msm8998/mixer_paths_i2s.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_i2s.xml \ + hardware/qcom/audio/configs/msm8998/audio_tuning_mixer.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio_tuning_mixer.txt \ + hardware/qcom/audio/configs/msm8998/audio_tuning_mixer_tavil.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio_tuning_mixer_tavil.txt \ + hardware/qcom/audio/configs/msm8998/audio_platform_info_i2s.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_i2s.xml \ + hardware/qcom/audio/configs/msm8998/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths.xml \ + hardware/qcom/audio/configs/msm8998/sound_trigger_mixer_paths_wcd9330.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths_wcd9330.xml \ + hardware/qcom/audio/configs/msm8998/sound_trigger_mixer_paths_wcd9340.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths_wcd9340.xml \ + hardware/qcom/audio/configs/msm8998/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_platform_info.xml \ + hardware/qcom/audio/configs/msm8998/graphite_ipc_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/graphite_ipc_platform_info.xml \ + hardware/qcom/audio/configs/msm8998/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml #XML Audio configuration files ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1) @@ -116,7 +116,7 @@ endif # Listen configuration file PRODUCT_COPY_FILES += \ - hardware/qcom/audio/configs/msm8998/listen_platform_info.xml:system/etc/listen_platform_info.xml + hardware/qcom/audio/configs/msm8998/listen_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/listen_platform_info.xml # Reduce client buffer size for fast audio output tracks PRODUCT_PROPERTY_OVERRIDES += \ diff --git a/configs/sdm660/sdm660.mk b/configs/sdm660/sdm660.mk index a0ae641a..62fe5c84 100644 --- a/configs/sdm660/sdm660.mk +++ b/configs/sdm660/sdm660.mk @@ -79,26 +79,26 @@ endif PRODUCT_COPY_FILES += \ hardware/qcom/audio/configs/sdm660/audio_output_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_output_policy.conf \ hardware/qcom/audio/configs/sdm660/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.conf \ - hardware/qcom/audio/configs/sdm660/mixer_paths.xml:system/etc/mixer_paths.xml \ - hardware/qcom/audio/configs/sdm660/mixer_paths_mtp.xml:system/etc/mixer_paths_mtp.xml \ - hardware/qcom/audio/configs/sdm660/mixer_paths_wcd9335.xml:system/etc/mixer_paths_wcd9335.xml \ - hardware/qcom/audio/configs/sdm660/mixer_paths_wcd9340.xml:system/etc/mixer_paths_wcd9340.xml \ - hardware/qcom/audio/configs/sdm660/mixer_paths_wcd9326.xml:system/etc/mixer_paths_wcd9326.xml \ - hardware/qcom/audio/configs/sdm660/mixer_paths_skus.xml:system/etc/mixer_paths_skus.xml \ - hardware/qcom/audio/configs/sdm660/mixer_paths_skush.xml:system/etc/mixer_paths_skush.xml \ - hardware/qcom/audio/configs/sdm660/mixer_paths_i2s.xml:system/etc/mixer_paths_i2s.xml \ - hardware/qcom/audio/configs/sdm660/audio_tuning_mixer.txt:system/etc/audio_tuning_mixer.txt \ - hardware/qcom/audio/configs/sdm660/audio_tuning_mixer_tavil.txt:system/etc/audio_tuning_mixer_tavil.txt \ - hardware/qcom/audio/configs/sdm660/audio_tuning_mixer_tasha.txt:system/etc/audio_tuning_mixer_tasha.txt \ - hardware/qcom/audio/configs/sdm660/audio_platform_info_extcodec.xml:system/etc/audio_platform_info_extcodec.xml \ - hardware/qcom/audio/configs/sdm660/audio_platform_info.xml:system/etc/audio_platform_info.xml \ - hardware/qcom/audio/configs/sdm660/audio_platform_info_skush.xml:system/etc/audio_platform_info_skush.xml \ - hardware/qcom/audio/configs/sdm660/sound_trigger_mixer_paths.xml:system/etc/sound_trigger_mixer_paths.xml \ - hardware/qcom/audio/configs/sdm660/sound_trigger_mixer_paths_wcd9330.xml:system/etc/sound_trigger_mixer_paths_wcd9330.xml \ - hardware/qcom/audio/configs/sdm660/sound_trigger_mixer_paths_wcd9335.xml:system/etc/sound_trigger_mixer_paths_wcd9335.xml \ - hardware/qcom/audio/configs/sdm660/sound_trigger_mixer_paths_wcd9340.xml:system/etc/sound_trigger_mixer_paths_wcd9340.xml \ - hardware/qcom/audio/configs/sdm660/sound_trigger_platform_info.xml:system/etc/sound_trigger_platform_info.xml \ - hardware/qcom/audio/configs/sdm660/graphite_ipc_platform_info.xml:system/etc/graphite_ipc_platform_info.xml + hardware/qcom/audio/configs/sdm660/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml \ + hardware/qcom/audio/configs/sdm660/mixer_paths_mtp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_mtp.xml \ + hardware/qcom/audio/configs/sdm660/mixer_paths_wcd9335.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_wcd9335.xml \ + hardware/qcom/audio/configs/sdm660/mixer_paths_wcd9340.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_wcd9340.xml \ + hardware/qcom/audio/configs/sdm660/mixer_paths_wcd9326.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_wcd9326.xml \ + hardware/qcom/audio/configs/sdm660/mixer_paths_skus.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_skus.xml \ + hardware/qcom/audio/configs/sdm660/mixer_paths_skush.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_skush.xml \ + hardware/qcom/audio/configs/sdm660/mixer_paths_i2s.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_i2s.xml \ + hardware/qcom/audio/configs/sdm660/audio_tuning_mixer.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio_tuning_mixer.txt \ + hardware/qcom/audio/configs/sdm660/audio_tuning_mixer_tavil.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio_tuning_mixer_tavil.txt \ + hardware/qcom/audio/configs/sdm660/audio_tuning_mixer_tasha.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio_tuning_mixer_tasha.txt \ + hardware/qcom/audio/configs/sdm660/audio_platform_info_extcodec.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_extcodec.xml \ + hardware/qcom/audio/configs/sdm660/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml \ + hardware/qcom/audio/configs/sdm660/audio_platform_info_skush.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_skush.xml \ + hardware/qcom/audio/configs/sdm660/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths.xml \ + hardware/qcom/audio/configs/sdm660/sound_trigger_mixer_paths_wcd9330.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths_wcd9330.xml \ + hardware/qcom/audio/configs/sdm660/sound_trigger_mixer_paths_wcd9335.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths_wcd9335.xml \ + hardware/qcom/audio/configs/sdm660/sound_trigger_mixer_paths_wcd9340.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths_wcd9340.xml \ + hardware/qcom/audio/configs/sdm660/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_platform_info.xml \ + hardware/qcom/audio/configs/sdm660/graphite_ipc_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/graphite_ipc_platform_info.xml #XML Audio configuration files ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1) @@ -119,7 +119,7 @@ endif # Listen configuration file PRODUCT_COPY_FILES += \ - hardware/qcom/audio/configs/sdm660/listen_platform_info.xml:system/etc/listen_platform_info.xml + hardware/qcom/audio/configs/sdm660/listen_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/listen_platform_info.xml # Reduce client buffer size for fast audio output tracks PRODUCT_PROPERTY_OVERRIDES += \ diff --git a/configs/sdm845/sdm845.mk b/configs/sdm845/sdm845.mk index 257115a8..19802b43 100644 --- a/configs/sdm845/sdm845.mk +++ b/configs/sdm845/sdm845.mk @@ -76,15 +76,15 @@ endif PRODUCT_COPY_FILES += \ hardware/qcom/audio/configs/sdm845/audio_output_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_output_policy.conf \ hardware/qcom/audio/configs/sdm845/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.conf \ - hardware/qcom/audio/configs/sdm845/mixer_paths_tavil.xml:system/etc/mixer_paths_tavil.xml \ - hardware/qcom/audio/configs/msm8998/mixer_paths_skuk.xml:system/etc/mixer_paths_skuk.xml \ - hardware/qcom/audio/configs/sdm845/mixer_paths_i2s.xml:system/etc/mixer_paths_i2s.xml \ - hardware/qcom/audio/configs/sdm845/aanc_tuning_mixer_tavil.txt:system/etc/aanc_tuning_mixer_tavil.txt \ - hardware/qcom/audio/configs/sdm845/audio_platform_info_i2s.xml:system/etc/audio_platform_info_i2s.xml \ - hardware/qcom/audio/configs/sdm845/sound_trigger_mixer_paths_wcd9340.xml:system/etc/sound_trigger_mixer_paths_wcd9340.xml \ - hardware/qcom/audio/configs/sdm845/sound_trigger_platform_info.xml:system/etc/sound_trigger_platform_info.xml \ - hardware/qcom/audio/configs/sdm845/graphite_ipc_platform_info.xml:system/etc/graphite_ipc_platform_info.xml \ - hardware/qcom/audio/configs/sdm845/audio_platform_info.xml:system/etc/audio_platform_info.xml + hardware/qcom/audio/configs/sdm845/mixer_paths_tavil.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_tavil.xml \ + hardware/qcom/audio/configs/msm8998/mixer_paths_skuk.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_skuk.xml \ + hardware/qcom/audio/configs/sdm845/mixer_paths_i2s.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_i2s.xml \ + hardware/qcom/audio/configs/sdm845/aanc_tuning_mixer_tavil.txt:$(TARGET_COPY_OUT_VENDOR)/etc/aanc_tuning_mixer_tavil.txt \ + hardware/qcom/audio/configs/sdm845/audio_platform_info_i2s.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_i2s.xml \ + hardware/qcom/audio/configs/sdm845/sound_trigger_mixer_paths_wcd9340.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths_wcd9340.xml \ + hardware/qcom/audio/configs/sdm845/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_platform_info.xml \ + hardware/qcom/audio/configs/sdm845/graphite_ipc_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/graphite_ipc_platform_info.xml \ + hardware/qcom/audio/configs/sdm845/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml #XML Audio configuration files ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1) @@ -105,7 +105,7 @@ endif # Listen configuration file PRODUCT_COPY_FILES += \ - hardware/qcom/audio/configs/sdm845/listen_platform_info.xml:system/etc/listen_platform_info.xml + hardware/qcom/audio/configs/sdm845/listen_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/listen_platform_info.xml # Reduce client buffer size for fast audio output tracks PRODUCT_PROPERTY_OVERRIDES += \ diff --git a/hal/Android.mk b/hal/Android.mk index 908619d6..d75cb0db 100644 --- a/hal/Android.mk +++ b/hal/Android.mk @@ -370,10 +370,14 @@ endif 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 44a51ed4..d1f863bc 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 "/system/etc/audio_platform_info.xml" +#define PLATFORM_INFO_XML_PATH "/vendor/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 7467579a..65fe2b7a 100644 --- a/hal/audio_extn/ssr.c +++ b/hal/audio_extn/ssr.c @@ -197,9 +197,9 @@ static int32_t drc_init_lib(int num_chan, int sample_rate __unused) /* TO DO: different config files for different sample rates */ if (num_chan == 6) { - cfgFileName = "/system/etc/drc/drc_cfg_5.1.txt"; + cfgFileName = "/vendor/etc/drc/drc_cfg_5.1.txt"; } else if (num_chan == 2) { - cfgFileName = "/system/etc/drc/drc_cfg_AZ.txt"; + cfgFileName = "/vendor/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 @@ static int32_t ssr_init_surround_sound_3mic_lib(unsigned long buffersize, int nu ssrmod.num_out_chan = num_out_chan; if (num_out_chan == 6) { - cfgFileName = "/system/etc/surround_sound_3mic/surround_sound_rec_5.1.cfg"; + cfgFileName = "/vendor/etc/surround_sound_3mic/surround_sound_rec_5.1.cfg"; } else if (num_out_chan == 2) { - cfgFileName = "/system/etc/surround_sound_3mic/surround_sound_rec_AZ.cfg"; + cfgFileName = "/vendor/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 @@ int32_t audio_extn_ssr_init(struct stream_in *in, int num_out_chan) otherwise, fopen may fail */ if ( !ssrmod.fp_input) { ALOGD("%s: Opening ssr input dump file \n", __func__); - ssrmod.fp_input = fopen("/data/misc/audio/ssr_input_3ch.pcm", "wb"); + ssrmod.fp_input = fopen("/data/vendor/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/misc/audio/ssr_output_6ch.pcm", "wb"); + ssrmod.fp_output = fopen("/data/vendor/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/misc/audio/ssr_output_2ch.pcm", "wb"); + ssrmod.fp_output = fopen("/data/vendor/misc/audio/ssr_output_2ch.pcm", "wb"); } } diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c index 22215e33..f05433d0 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 "/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" +#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" #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 "/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" +#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" #endif -#define MIXER_XML_PATH_SKUN "/system/etc/mixer_paths_qrd_skun.xml" +#define MIXER_XML_PATH_SKUN "/vendor/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 47cae0cb..1f0d2450 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 "/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" +#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" #endif #include diff --git a/mm-audio/aenc-aac/qdsp6/Android.mk b/mm-audio/aenc-aac/qdsp6/Android.mk index acc1fdbf..fa679a88 100644 --- a/mm-audio/aenc-aac/qdsp6/Android.mk +++ b/mm-audio/aenc-aac/qdsp6/Android.mk @@ -25,8 +25,10 @@ include $(CLEAR_VARS) libOmxAacEnc-inc := $(LOCAL_PATH)/inc libOmxAacEnc-inc += $(TARGET_OUT_HEADERS)/mm-core/omxcore -LOCAL_MODULE := libOmxAacEnc -LOCAL_MODULE_TAGS := optional +LOCAL_MODULE := libOmxAacEnc +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_OWNER := qti +LOCAL_PROPRIETARY_MODULE := true LOCAL_CFLAGS := $(libOmxAacEnc-def) LOCAL_C_INCLUDES := $(libOmxAacEnc-inc) LOCAL_PRELINK_MODULE := false diff --git a/mm-audio/aenc-amrnb/qdsp6/Android.mk b/mm-audio/aenc-amrnb/qdsp6/Android.mk index 346602cc..9aff6670 100644 --- a/mm-audio/aenc-amrnb/qdsp6/Android.mk +++ b/mm-audio/aenc-amrnb/qdsp6/Android.mk @@ -25,8 +25,10 @@ include $(CLEAR_VARS) libOmxAmrEnc-inc := $(LOCAL_PATH)/inc libOmxAmrEnc-inc += $(TARGET_OUT_HEADERS)/mm-core/omxcore -LOCAL_MODULE := libOmxAmrEnc -LOCAL_MODULE_TAGS := optional +LOCAL_MODULE := libOmxAmrEnc +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_OWNER := qti +LOCAL_PROPRIETARY_MODULE := true LOCAL_CFLAGS := $(libOmxAmrEnc-def) LOCAL_C_INCLUDES := $(libOmxAmrEnc-inc) LOCAL_PRELINK_MODULE := false diff --git a/mm-audio/aenc-evrc/qdsp6/Android.mk b/mm-audio/aenc-evrc/qdsp6/Android.mk index 83f105e3..eed53ba7 100644 --- a/mm-audio/aenc-evrc/qdsp6/Android.mk +++ b/mm-audio/aenc-evrc/qdsp6/Android.mk @@ -25,8 +25,10 @@ include $(CLEAR_VARS) libOmxEvrcEnc-inc := $(LOCAL_PATH)/inc libOmxEvrcEnc-inc += $(TARGET_OUT_HEADERS)/mm-core/omxcore -LOCAL_MODULE := libOmxEvrcEnc -LOCAL_MODULE_TAGS := optional +LOCAL_MODULE := libOmxEvrcEnc +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_OWNER := qti +LOCAL_PROPRIETARY_MODULE := true LOCAL_CFLAGS := $(libOmxEvrcEnc-def) LOCAL_C_INCLUDES := $(libOmxEvrcEnc-inc) LOCAL_PRELINK_MODULE := false diff --git a/mm-audio/aenc-g711/qdsp6/Android.mk b/mm-audio/aenc-g711/qdsp6/Android.mk index b4e60d40..9c946125 100644 --- a/mm-audio/aenc-g711/qdsp6/Android.mk +++ b/mm-audio/aenc-g711/qdsp6/Android.mk @@ -25,8 +25,10 @@ include $(CLEAR_VARS) libOmxG711Enc-inc := $(LOCAL_PATH)/inc libOmxG711Enc-inc += $(TARGET_OUT_HEADERS)/mm-core/omxcore -LOCAL_MODULE := libOmxG711Enc -LOCAL_MODULE_TAGS := optional +LOCAL_MODULE := libOmxG711Enc +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_OWNER := qti +LOCAL_PROPRIETARY_MODULE := true LOCAL_CFLAGS := $(libOmxG711Enc-def) LOCAL_C_INCLUDES := $(libOmxG711Enc-inc) LOCAL_PRELINK_MODULE := false diff --git a/mm-audio/aenc-qcelp13/qdsp6/Android.mk b/mm-audio/aenc-qcelp13/qdsp6/Android.mk index b575d7f3..ac2b5ffe 100644 --- a/mm-audio/aenc-qcelp13/qdsp6/Android.mk +++ b/mm-audio/aenc-qcelp13/qdsp6/Android.mk @@ -25,8 +25,10 @@ include $(CLEAR_VARS) libOmxQcelp13Enc-inc := $(LOCAL_PATH)/inc libOmxQcelp13Enc-inc += $(TARGET_OUT_HEADERS)/mm-core/omxcore -LOCAL_MODULE := libOmxQcelp13Enc -LOCAL_MODULE_TAGS := optional +LOCAL_MODULE := libOmxQcelp13Enc +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_OWNER := qti +LOCAL_PROPRIETARY_MODULE := true LOCAL_CFLAGS := $(libOmxQcelp13Enc-def) LOCAL_C_INCLUDES := $(libOmxQcelp13Enc-inc) LOCAL_PRELINK_MODULE := false diff --git a/post_proc/Android.mk b/post_proc/Android.mk index 56c45a04..23fc14f4 100644 --- a/post_proc/Android.mk +++ b/post_proc/Android.mk @@ -42,6 +42,8 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE_RELATIVE_PATH := soundfx LOCAL_MODULE:= libqcompostprocbundle +LOCAL_MODULE_OWNER := qti +LOCAL_PROPRIETARY_MODULE := true LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr @@ -74,6 +76,8 @@ LOCAL_CFLAGS += -DHW_ACC_HPX endif LOCAL_MODULE:= libhwacceffectswrapper +LOCAL_MODULE_OWNER := qti +LOCAL_PROPRIETARY_MODULE := true include $(BUILD_STATIC_LIBRARY) endif @@ -85,7 +89,7 @@ ifneq ($(filter msm8992 msm8994 msm8996 msm8998 sdm660 sdm845,$(TARGET_BOARD_PLA include $(CLEAR_VARS) -LOCAL_CFLAGS := -DLIB_AUDIO_HAL="/system/lib/hw/audio.primary."$(TARGET_BOARD_PLATFORM)".so" +LOCAL_CFLAGS := -DLIB_AUDIO_HAL="/vendor/lib/hw/audio.primary."$(TARGET_BOARD_PLATFORM)".so" LOCAL_SRC_FILES:= \ volume_listener.c @@ -99,6 +103,8 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE_RELATIVE_PATH := soundfx LOCAL_MODULE:= libvolumelistener +LOCAL_MODULE_OWNER := qti +LOCAL_PROPRIETARY_MODULE := true LOCAL_C_INCLUDES := \ hardware/qcom/audio/hal \ diff --git a/visualizer/Android.mk b/visualizer/Android.mk index 622af338..8738b836 100644 --- a/visualizer/Android.mk +++ b/visualizer/Android.mk @@ -33,6 +33,8 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE_RELATIVE_PATH := soundfx LOCAL_MODULE:= libqcomvisualizer +LOCAL_MODULE_OWNER := qti +LOCAL_PROPRIETARY_MODULE := true LOCAL_C_INCLUDES := \ external/tinyalsa/include \ diff --git a/voice_processing/Android.mk b/voice_processing/Android.mk index 73619c6c..72ab1d36 100644 --- a/voice_processing/Android.mk +++ b/voice_processing/Android.mk @@ -6,6 +6,8 @@ include $(CLEAR_VARS) LOCAL_MODULE:= libqcomvoiceprocessing LOCAL_MODULE_TAGS := optional LOCAL_MODULE_RELATIVE_PATH := soundfx +LOCAL_MODULE_OWNER := qti +LOCAL_PROPRIETARY_MODULE := true LOCAL_SRC_FILES:= \ voice_processing.c