hal: add missing flags for extended features
- add missing feature flags and definitions
to compile hal without extended features
enabled.
Change-Id: I8c04ae54e6597ed43de60b2d01ca333070aef675
diff --git a/hal/Android.mk b/hal/Android.mk
index 87ebeea..bc17a57 100644
--- a/hal/Android.mk
+++ b/hal/Android.mk
@@ -37,6 +37,10 @@
LOCAL_SRC_FILES += audio_extn/audio_extn.c
+ifneq ($(strip $(AUDIO_FEATURE_DISABLED_PCM_OFFLOAD)),true)
+ LOCAL_CFLAGS += -DPCM_OFFLOAD_ENABLED
+endif
+
ifneq ($(strip $(AUDIO_FEATURE_DISABLED_ANC_HEADSET)),true)
LOCAL_CFLAGS += -DANC_HEADSET_ENABLED
endif
diff --git a/hal/audio_extn/audio_extn.h b/hal/audio_extn/audio_extn.h
index 7feeb42..80bc434 100644
--- a/hal/audio_extn/audio_extn.h
+++ b/hal/audio_extn/audio_extn.h
@@ -22,6 +22,45 @@
#include <cutils/str_parms.h>
+#ifndef PCM_OFFLOAD_ENABLED
+#define AUDIO_FORMAT_PCM_OFFLOAD 0x17000000UL
+#define AUDIO_FORMAT_PCM_16_BIT_OFFLOAD (AUDIO_FORMAT_PCM_OFFLOAD | AUDIO_FORMAT_PCM_SUB_16_BIT)
+#define AUDIO_FORMAT_PCM_24_BIT_OFFLOAD (AUDIO_FORMAT_PCM_OFFLOAD | AUDIO_FORMAT_PCM_SUB_8_24_BIT)
+#define AUDIO_OFFLOAD_CODEC_FORMAT "music_offload_codec_format"
+static inline bool audio_is_offload_pcm(audio_format_t format) {
+ return ((format & AUDIO_FORMAT_MAIN_MASK) == AUDIO_FORMAT_PCM_OFFLOAD);
+}
+#endif
+
+#ifndef AFE_PROXY_ENABLED
+#define AUDIO_DEVICE_OUT_PROXY 0x40000
+#endif
+
+#ifndef COMPRESS_VOIP_ENABLED
+#define AUDIO_OUTPUT_FLAG_VOIP_RX 0x4000
+#endif
+
+#ifndef INCALL_MUSIC_ENABLED
+#define AUDIO_OUTPUT_FLAG_INCALL_MUSIC 0x8000
+#endif
+
+#ifndef FLUENCE_ENABLED
+#define AUDIO_PARAMETER_KEY_FLUENCE "fluence"
+#define AUDIO_PARAMETER_VALUE_QUADMIC "quadmic"
+#define AUDIO_PARAMETER_VALUE_DUALMIC "dualmic"
+#define AUDIO_PARAMETER_KEY_NO_FLUENCE "none"
+#endif
+
+#ifndef FM_ENABLED
+#define AUDIO_DEVICE_OUT_FM 0x80000
+#define AUDIO_DEVICE_OUT_FM_TX 0x100000
+#define AUDIO_SOURCE_FM_RX 9
+#define AUDIO_SOURCE_FM_RX_A2DP 10
+#define AUDIO_DEVICE_IN_FM_RX (AUDIO_DEVICE_BIT_IN | 0x8000)
+#define AUDIO_DEVICE_IN_FM_RX_A2DP AUDIO_DEVICE_BIT_IN | 0x10000
+#endif
+
+
void audio_extn_set_parameters(struct audio_device *adev,
struct str_parms *parms);
diff --git a/hal/voice_extn/voice_extn.c b/hal/voice_extn/voice_extn.c
index f6083f3..5dbd7b9 100644
--- a/hal/voice_extn/voice_extn.c
+++ b/hal/voice_extn/voice_extn.c
@@ -570,6 +570,7 @@
voice_extn_compress_voip_in_get_parameters(in, query, reply);
}
+#ifdef INCALL_MUSIC_ENABLED
int voice_extn_check_and_set_incall_music_usecase(struct audio_device *adev,
struct stream_out *out)
{
@@ -591,4 +592,5 @@
return 0;
}
+#endif
diff --git a/policy_hal/Android.mk b/policy_hal/Android.mk
index 4f3a737..517f207 100644
--- a/policy_hal/Android.mk
+++ b/policy_hal/Android.mk
@@ -1,4 +1,4 @@
-ifeq ($(strip $(BOARD_USES_ALSA_AUDIO)),true)
+ifneq ($(strip $(BOARD_USES_AOSP_AUDIO_POLICY_MANAGER)),true)
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
diff --git a/post_proc/Android.mk b/post_proc/Android.mk
index 2cb910c..c50b7d0 100644
--- a/post_proc/Android.mk
+++ b/post_proc/Android.mk
@@ -3,6 +3,10 @@
include $(CLEAR_VARS)
+ifneq ($(strip $(AUDIO_FEATURE_DISABLED_PROXY_DEVICE)),true)
+ LOCAL_CFLAGS += -DAFE_PROXY_ENABLED
+endif
+
LOCAL_SRC_FILES:= \
bundle.c \
equalizer.c \
diff --git a/post_proc/bass_boost.c b/post_proc/bass_boost.c
index 657195d..341f145 100644
--- a/post_proc/bass_boost.c
+++ b/post_proc/bass_boost.c
@@ -100,12 +100,12 @@
switch (param) {
case BASSBOOST_PARAM_STRENGTH_SUPPORTED:
- ALOGV("%s: BASSBOOST_PARAM_STRENGTH_SUPPORTED", __func__);
+ ALOGV("%s: BASSBOOST_PARAM_STRENGTH_SUPPORTED", __func__);
*(uint32_t *)value = 1;
break;
case BASSBOOST_PARAM_STRENGTH:
- ALOGV("%s: BASSBOOST_PARAM_STRENGTH", __func__);
+ ALOGV("%s: BASSBOOST_PARAM_STRENGTH", __func__);
*(int16_t *)value = bassboost_get_strength(bass_ctxt);
break;
@@ -133,7 +133,7 @@
switch (param) {
case BASSBOOST_PARAM_STRENGTH:
- ALOGV("%s BASSBOOST_PARAM_STRENGTH", __func__);
+ ALOGV("%s BASSBOOST_PARAM_STRENGTH", __func__);
strength = (uint32_t)(*(int16_t *)value);
bassboost_set_strength(bass_ctxt, strength);
break;
@@ -154,7 +154,9 @@
if((device == AUDIO_DEVICE_OUT_SPEAKER) ||
(device == AUDIO_DEVICE_OUT_BLUETOOTH_SCO_CARKIT) ||
(device == AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER) ||
+#ifdef AFE_PROXY_ENABLED
(device == AUDIO_DEVICE_OUT_PROXY) ||
+#endif
(device == AUDIO_DEVICE_OUT_AUX_DIGITAL) ||
(device == AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET)) {
if (offload_bassboost_get_enable_flag(&(bass_ctxt->offload_bass))) {
diff --git a/post_proc/virtualizer.c b/post_proc/virtualizer.c
index 54bca07..205b250 100644
--- a/post_proc/virtualizer.c
+++ b/post_proc/virtualizer.c
@@ -100,12 +100,12 @@
switch (param) {
case VIRTUALIZER_PARAM_STRENGTH_SUPPORTED:
- ALOGV("%s: VIRTUALIZER_PARAM_STRENGTH_SUPPORTED", __func__);
+ ALOGV("%s: VIRTUALIZER_PARAM_STRENGTH_SUPPORTED", __func__);
*(uint32_t *)value = 1;
break;
case VIRTUALIZER_PARAM_STRENGTH:
- ALOGV("%s: VIRTUALIZER_PARAM_STRENGTH", __func__);
+ ALOGV("%s: VIRTUALIZER_PARAM_STRENGTH", __func__);
*(int16_t *)value = virtualizer_get_strength(virt_ctxt);
break;
@@ -133,7 +133,7 @@
switch (param) {
case VIRTUALIZER_PARAM_STRENGTH:
- ALOGV("%s VIRTUALIZER_PARAM_STRENGTH", __func__);
+ ALOGV("%s VIRTUALIZER_PARAM_STRENGTH", __func__);
strength = (uint32_t)(*(int16_t *)value);
virtualizer_set_strength(virt_ctxt, strength);
break;
@@ -154,7 +154,9 @@
if((device == AUDIO_DEVICE_OUT_SPEAKER) ||
(device == AUDIO_DEVICE_OUT_BLUETOOTH_SCO_CARKIT) ||
(device == AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER) ||
+#ifdef AFE_PROXY_ENABLED
(device == AUDIO_DEVICE_OUT_PROXY) ||
+#endif
(device == AUDIO_DEVICE_OUT_AUX_DIGITAL) ||
(device == AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET)) {
if (offload_virtualizer_get_enable_flag(&(virt_ctxt->offload_virt))) {