Set product files and packages for APPE based audio

The APPE HAL and the previous primary HAL cannot coexist, so the
APPE HAL must become the primary HAL when the APPE_AUDIO feature
is enabled.

Similarly, some product files are specific to APPE and replace those
used by the previous primary and JAMR3 HALs.

Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
[move to am57xevm but do not enable APPE/JAMR changes as they might
be not applicable on this EVM]
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>

Change-Id: I2911e58fcefb4c8dd5e8bbda1ff01f816aa57f31

2 files changed, 24 insertions, 1 deletions

diff --git a/audio/Android.mk b/audio/Android.mk
index 9e14b16..4b34495 100644
--- a/audio/Android.mk
+++ b/audio/Android.mk
@@ -13,4 +13,10 @@
 # limitations under the License.
 
 LOCAL_PATH := $(call my-dir)
+
+
+ifeq ($(APPE_AUDIO),true)
+include $(LOCAL_PATH)/hdmi/Android.mk
+else
 include $(call all-makefiles-under,$(LOCAL_PATH))
+endif
diff --git a/device.mk b/device.mk
index 501e75c..813ebf4 100644
--- a/device.mk
+++ b/device.mk
@@ -14,6 +14,9 @@
 # limitations under the License.
 #
 
+# Audio Post Processing Engine (APPE)
+APPE_AUDIO := false
+
 ifeq ($(TARGET_PREBUILT_KERNEL),)
 LOCAL_KERNEL := device/ti/am57xevm/kernel
 else
@@ -44,8 +47,16 @@ PRODUCT_COPY_FILES += \
         frameworks/native/data/etc/android.hardware.camera.front.xml:system/etc/permissions/android.hardware.camera.front.xml \
 
 # Audio
+ifeq ($(APPE_AUDIO),true)
+PRODUCT_COPY_FILES += \
+        hardware/ti/radio/vis_sdk/packages/android/hal/mixer_paths.xml:system/etc/mixer_paths.xml
+else
+PRODUCT_COPY_FILES += \
+        device/ti/am57xevm/audio/primary/mixer_paths.xml:system/etc/mixer_paths.xml
+#       device/ti/am57xevm/audio/primary/mixer_paths.xml:system/etc/mixer_paths.xml \
+#       device/ti/am57xevm/audio/jamr3/jamr3_mixer_paths.xml:system/etc/jamr3_mixer_paths.xml
+
 PRODUCT_COPY_FILES += \
-        device/ti/am57xevm/audio/primary/mixer_paths.xml:system/etc/mixer_paths.xml \
         device/ti/am57xevm/audio/audio_policy.conf:system/etc/audio_policy.conf
 
 # cpuset configuration
@@ -102,6 +113,12 @@ PRODUCT_PACKAGES += \
 # Audio HAL modules
 PRODUCT_PACKAGES += audio.primary.am57x
 PRODUCT_PACKAGES += audio.hdmi.am57x
+
+# JAMR3 Audio HAL module
+# ifneq ($(APPE_AUDIO),true)
+# PRODUCT_PACKAGES += audio.jamr3.am57x
+# endif
+
 # BlueDroid a2dp Audio HAL module
 PRODUCT_PACKAGES += audio.a2dp.default
 # Remote submix