commit 73e2e8bd175918f56dbe8437857e6b3ed0b7af45
author Pradnya Chaphekar <pradnyac@codeaurora.org> Fri May 01 02:18:17 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon May 18 15:35:43 2015 -0700
tree ec4ce666aa63b213df7c8970a0af422725295496
parent 43be559d727d566d632a7a3b79b936fec77dcc42

hal: Set ddp endpoint params for Dolby decoder

- Set ddp endpoint params for Dolby decoder
- Rename DOLBY_DAP macro. Legacy DS1 functions
  using mixer controls get enabled when dolby
  buildspec enables DOLBY_DAP macro. Avoid this
  by renaming the macro.

Change-Id: I66c7d1896f4260754551f03852fa8c140abf0e53

hal/Android.mk

diff --git a/hal/Android.mk b/hal/Android.mk
index 4e5f846..e0149f9 100644
--- a/hal/Android.mk
+++ b/hal/Android.mk
@@ -149,7 +149,7 @@
     LOCAL_SRC_FILES += audio_extn/dolby.c
 endif
 
-ifeq ($(strip $(DOLBY_DAP)),true)
+ifeq ($(strip $(DS1_DOLBY_DAP)),true)
     LOCAL_CFLAGS += -DDS1_DOLBY_DAP_ENABLED
 ifneq ($(strip $(DOLBY_DDP)),true)
     LOCAL_SRC_FILES += audio_extn/dolby.c
@@ -205,8 +205,9 @@
 
 ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DS2_DOLBY_DAP)),true)
     LOCAL_CFLAGS += -DDS2_DOLBY_DAP_ENABLED
+    LOCAL_CFLAGS += -DDS1_DOLBY_DDP_ENABLED
 ifneq ($(strip $(DOLBY_DDP)),true)
-    ifneq ($(strip $(DOLBY_DAP)),true)
+    ifneq ($(strip $(DS1_DOLBY_DAP)),true)
         LOCAL_SRC_FILES += audio_extn/dolby.c
     endif
 endif