From 05f20b18b969fb7f16c394d6f1a4635bb83b6a6f Mon Sep 17 00:00:00 2001 From: Dhananjay Kumar Date: Fri, 31 Mar 2017 03:46:42 +0530 Subject: [PATCH] sdm660 :disable additional audio features and add HIDL component Disable additional features to enable AOSP compilation for SDM660. Add audio HIDL component. Change-Id: I292df24a5164775bf8033b85336a247910aea89f --- configs/sdm660/sdm660.mk | 47 +++++++++++++++++++++++-------------- hal/audio_extn/audio_extn.h | 2 +- hal/msm8916/platform.c | 1 - 3 files changed, 30 insertions(+), 20 deletions(-) diff --git a/configs/sdm660/sdm660.mk b/configs/sdm660/sdm660.mk index 45ff7f1e..5496d34d 100644 --- a/configs/sdm660/sdm660.mk +++ b/configs/sdm660/sdm660.mk @@ -2,13 +2,10 @@ # #AUDIO_FEATURE_FLAGS BOARD_USES_ALSA_AUDIO := true +TARGET_USES_AOSP_FOR_AUDIO:=true + +ifneq ($(TARGET_USES_AOSP_FOR_AUDIO), true) USE_CUSTOM_AUDIO_POLICY := 1 -USE_XML_AUDIO_POLICY_CONF := 1 -BOARD_SUPPORTS_SOUND_TRIGGER_HAL := true -AUDIO_USE_LL_AS_PRIMARY_OUTPUT := true -AUDIO_FEATURE_ENABLED_HIFI_AUDIO := true -AUDIO_FEATURE_ENABLED_VBAT_MONITOR := true -AUDIO_FEATURE_ENABLED_ANC_HEADSET := true AUDIO_FEATURE_ENABLED_COMPRESS_CAPTURE := false AUDIO_FEATURE_ENABLED_COMPRESS_VOIP := true AUDIO_FEATURE_ENABLED_CUSTOMSTEREO := true @@ -16,15 +13,11 @@ AUDIO_FEATURE_ENABLED_EXTN_FORMATS := true AUDIO_FEATURE_ENABLED_EXTN_FLAC_DECODER := true AUDIO_FEATURE_ENABLED_EXTN_RESAMPLER := true AUDIO_FEATURE_ENABLED_FM_POWER_OPT := true -AUDIO_FEATURE_ENABLED_FLUENCE := true AUDIO_FEATURE_ENABLED_HDMI_SPK := true AUDIO_FEATURE_ENABLED_HDMI_EDID := true AUDIO_FEATURE_ENABLED_HDMI_PASSTHROUGH := true #AUDIO_FEATURE_ENABLED_KEEP_ALIVE := true AUDIO_FEATURE_ENABLED_DISPLAY_PORT := true -AUDIO_FEATURE_ENABLED_DS2_DOLBY_DAP := true -AUDIO_FEATURE_ENABLED_HFP := true -AUDIO_FEATURE_ENABLED_INCALL_MUSIC := false AUDIO_FEATURE_ENABLED_MULTI_VOICE_SESSIONS := true AUDIO_FEATURE_ENABLED_PCM_OFFLOAD := true AUDIO_FEATURE_ENABLED_PCM_OFFLOAD_24 := true @@ -35,25 +28,36 @@ AUDIO_FEATURE_ENABLED_ALAC_OFFLOAD := true AUDIO_FEATURE_ENABLED_APE_OFFLOAD := true AUDIO_FEATURE_ENABLED_AAC_ADTS_OFFLOAD := true AUDIO_FEATURE_ENABLED_PROXY_DEVICE := true -AUDIO_FEATURE_ENABLED_KPI_OPTIMIZE := true -AUDIO_FEATURE_ENABLED_SPKR_PROTECTION := true AUDIO_FEATURE_ENABLED_SSR := true -AUDIO_FEATURE_ENABLED_ACDB_LICENSE := true - +AUDIO_FEATURE_ENABLED_DS2_DOLBY_DAP := true +AUDIO_FEATURE_ENABLED_HFP := true AUDIO_FEATURE_ENABLED_DTS_EAGLE := false BOARD_USES_SRS_TRUEMEDIA := false DTS_CODEC_M_ := false -AUDIO_FEATURE_ENABLED_DEV_ARBI := false -MM_AUDIO_ENABLED_FTM := true MM_AUDIO_ENABLED_SAFX := true -TARGET_USES_QCOM_MM_AUDIO := true AUDIO_FEATURE_ENABLED_HW_ACCELERATED_EFFECTS := false - AUDIO_FEATURE_ENABLED_SOURCE_TRACKING := true AUDIO_FEATURE_ENABLED_AUDIOSPHERE := true AUDIO_FEATURE_ENABLED_GEF_SUPPORT := true AUDIO_FEATURE_ENABLED_USB_TUNNEL_AUDIO := true AUDIO_FEATURE_ENABLED_SPLIT_A2DP := true +AUDIO_FEATURE_ENABLED_3D_AUDIO := true +endif + +USE_XML_AUDIO_POLICY_CONF := 1 +BOARD_SUPPORTS_SOUND_TRIGGER := true +AUDIO_USE_LL_AS_PRIMARY_OUTPUT := true +AUDIO_FEATURE_ENABLED_HIFI_AUDIO := true +AUDIO_FEATURE_ENABLED_VBAT_MONITOR := true +AUDIO_FEATURE_ENABLED_ANC_HEADSET := true +AUDIO_FEATURE_ENABLED_FLUENCE := true +AUDIO_FEATURE_ENABLED_INCALL_MUSIC := false +AUDIO_FEATURE_ENABLED_KPI_OPTIMIZE := true +AUDIO_FEATURE_ENABLED_SPKR_PROTECTION := true +AUDIO_FEATURE_ENABLED_ACDB_LICENSE := true +AUDIO_FEATURE_ENABLED_DEV_ARBI := false +MM_AUDIO_ENABLED_FTM := true +TARGET_USES_QCOM_MM_AUDIO := true AUDIO_FEATURE_ENABLED_RAS := true ##AUDIO_FEATURE_FLAGS @@ -238,3 +242,10 @@ persist.audio.hifi.int_codec=true #offload pausetime out duration to 3 secs to inline with other outputs PRODUCT_PROPERTY_OVERRIDES += \ audio.offload.pstimeout.secs=3 + +# for HIDL related packages +PRODUCT_PACKAGES += \ + android.hardware.audio@2.0-service \ + android.hardware.audio@2.0-impl \ + android.hardware.audio.effect@2.0-impl \ + android.hardware.soundtrigger@2.0-impl diff --git a/hal/audio_extn/audio_extn.h b/hal/audio_extn/audio_extn.h index b83ef4df..e6e59456 100644 --- a/hal/audio_extn/audio_extn.h +++ b/hal/audio_extn/audio_extn.h @@ -419,7 +419,7 @@ void audio_extn_dolby_set_dmid(struct audio_device *adev); #if defined(DS1_DOLBY_DDP_ENABLED) || defined(DS1_DOLBY_DAP_ENABLED) || defined(DS2_DOLBY_DAP_ENABLED) void audio_extn_dolby_set_license(struct audio_device *adev); #else -#define audio_extn_dolby_set_license(adev) (0) +static void __unused audio_extn_dolby_set_license(struct audio_device *adev __unused) {}; #endif #ifndef DS1_DOLBY_DAP_ENABLED diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c index 74c194fe..f8879045 100644 --- a/hal/msm8916/platform.c +++ b/hal/msm8916/platform.c @@ -4340,7 +4340,6 @@ static int set_hd_voice(struct platform_data *my_data, bool state) int platform_set_parameters(void *platform, struct str_parms *parms) { struct platform_data *my_data = (struct platform_data *)platform; - struct audio_device *adev = my_data->adev; char value[256] = {0}; int len; int ret = 0, err;