audio: enable compilation without flag TARGET_USES_AOSP_FOR_AUDIO
- Disable some features to enable compilation without AOSP flag.
- Add new feature flags to guard legacy features not
required on O.
- Update channel index used for surround sound recording as per
latest channel mapping index.
Change-Id: I4d2654b8c8938dea60388524ebb43980a3fd8c3d
diff --git a/Android.mk b/Android.mk
index 1550455..e1e5a0c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -18,7 +18,7 @@
include $(MY_LOCAL_PATH)/qahw_api/Android.mk
endif
-ifneq ($(TARGET_USES_AOSP_FOR_AUDIO), true)
+ifeq ($(USE_LEGACY_AUDIO_DAEMON), true)
include $(MY_LOCAL_PATH)/audiod/Android.mk
endif
diff --git a/configs/msm8937/msm8937.mk b/configs/msm8937/msm8937.mk
index e87628a..bf28b8c 100644
--- a/configs/msm8937/msm8937.mk
+++ b/configs/msm8937/msm8937.mk
@@ -30,6 +30,7 @@
AUDIO_FEATURE_ENABLED_HW_ACCELERATED_EFFECTS := false
AUDIO_FEATURE_ENABLED_DS2_DOLBY_DAP := true
AUDIO_FEATURE_ENABLED_AUDIOSPHERE := true
+DOLBY_ENABLE := false
endif
USE_XML_AUDIO_POLICY_CONF := 1
diff --git a/configs/msm8953/msm8953.mk b/configs/msm8953/msm8953.mk
index f4cacd6..abcc1d2 100644
--- a/configs/msm8953/msm8953.mk
+++ b/configs/msm8953/msm8953.mk
@@ -29,6 +29,7 @@
AUDIO_FEATURE_ENABLED_HW_ACCELERATED_EFFECTS := false
AUDIO_FEATURE_ENABLED_DS2_DOLBY_DAP := true
AUDIO_FEATURE_ENABLED_AUDIOSPHERE := true
+DOLBY_ENABLE := false
endif
USE_XML_AUDIO_POLICY_CONF := 1
diff --git a/configs/msm8996/msm8996.mk b/configs/msm8996/msm8996.mk
index d3aeb5e..68b13d4 100644
--- a/configs/msm8996/msm8996.mk
+++ b/configs/msm8996/msm8996.mk
@@ -29,6 +29,7 @@
AUDIO_FEATURE_ENABLED_HW_ACCELERATED_EFFECTS := false
AUDIO_FEATURE_ENABLED_DS2_DOLBY_DAP := true
AUDIO_FEATURE_ENABLED_AUDIOSPHERE := true
+DOLBY_ENABLE := false
endif
USE_XML_AUDIO_POLICY_CONF := 1
diff --git a/configs/msm8998/msm8998.mk b/configs/msm8998/msm8998.mk
index c25550e..07a4bff 100644
--- a/configs/msm8998/msm8998.mk
+++ b/configs/msm8998/msm8998.mk
@@ -29,8 +29,12 @@
AUDIO_FEATURE_ENABLED_HW_ACCELERATED_EFFECTS := false
AUDIO_FEATURE_ENABLED_AUDIOSPHERE := true
AUDIO_FEATURE_ENABLED_USB_TUNNEL_AUDIO := true
-AUDIO_FEATURE_ENABLED_SPLIT_A2DP := true
-AUDIO_FEATURE_ENABLED_3D_AUDIO := true
+AUDIO_FEATURE_ENABLED_SPLIT_A2DP := false
+AUDIO_FEATURE_ENABLED_3D_AUDIO := false
+AUDIO_FEATURE_ENABLED_VOICE_PRINT := false
+USE_LEGACY_AUDIO_DAEMON := false
+USE_LEGACY_AUDIO_MEASUREMENT := false
+DOLBY_ENABLE := false
endif
USE_XML_AUDIO_POLICY_CONF := 1
diff --git a/configs/msmskunk/msmskunk.mk b/configs/msmskunk/msmskunk.mk
index 389090c..099d582 100644
--- a/configs/msmskunk/msmskunk.mk
+++ b/configs/msmskunk/msmskunk.mk
@@ -29,8 +29,9 @@
AUDIO_FEATURE_ENABLED_HW_ACCELERATED_EFFECTS := false
AUDIO_FEATURE_ENABLED_AUDIOSPHERE := true
AUDIO_FEATURE_ENABLED_USB_TUNNEL_AUDIO := true
-AUDIO_FEATURE_ENABLED_SPLIT_A2DP := true
-AUDIO_FEATURE_ENABLED_3D_AUDIO := true
+AUDIO_FEATURE_ENABLED_SPLIT_A2DP := false
+AUDIO_FEATURE_ENABLED_3D_AUDIO := false
+DOLBY_ENABLE := false
endif
USE_XML_AUDIO_POLICY_CONF := 1
diff --git a/configs/sdm660/sdm660.mk b/configs/sdm660/sdm660.mk
index 5496d34..dee74b1 100644
--- a/configs/sdm660/sdm660.mk
+++ b/configs/sdm660/sdm660.mk
@@ -40,8 +40,9 @@
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
+AUDIO_FEATURE_ENABLED_SPLIT_A2DP := false
+AUDIO_FEATURE_ENABLED_3D_AUDIO := false
+DOLBY_ENABLE := false
endif
USE_XML_AUDIO_POLICY_CONF := 1
diff --git a/hal/audio_extn/ssr.c b/hal/audio_extn/ssr.c
index 51a6a26..f64a861 100644
--- a/hal/audio_extn/ssr.c
+++ b/hal/audio_extn/ssr.c
@@ -367,7 +367,7 @@
*/
ALOGD("%s: SSR supports only channel representation position, channel_mask(%#x)"
,__func__, config->channel_mask);
- config->channel_mask = AUDIO_CHANNEL_IN_5POINT1;
+ config->channel_mask = AUDIO_CHANNEL_IN_6;
ret = 0;
*update_params = true;
} else {