summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPraneeth Bajjuri2017-01-17 18:28:17 -0600
committerPraneeth Bajjuri2017-01-17 18:57:43 -0600
commit6442193dcf79f978a5c36954197633ef768bd8b6 (patch)
tree47abd699c0b8fabc6e3ab93662e3370aea84f27b
parent2b7c14f0d312cdc3baa92b00bc9354aeac6208d9 (diff)
downloaddevice-ti-am57xevm-6442193dcf79f978a5c36954197633ef768bd8b6.tar.gz
device-ti-am57xevm-6442193dcf79f978a5c36954197633ef768bd8b6.tar.xz
device-ti-am57xevm-6442193dcf79f978a5c36954197633ef768bd8b6.zip
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
-rw-r--r--audio/Android.mk6
-rw-r--r--device.mk19
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 @@
13# limitations under the License. 13# limitations under the License.
14 14
15LOCAL_PATH := $(call my-dir) 15LOCAL_PATH := $(call my-dir)
16
17
18ifeq ($(APPE_AUDIO),true)
19include $(LOCAL_PATH)/hdmi/Android.mk
20else
16include $(call all-makefiles-under,$(LOCAL_PATH)) 21include $(call all-makefiles-under,$(LOCAL_PATH))
22endif
diff --git a/device.mk b/device.mk
index 501e75c..813ebf4 100644
--- a/device.mk
+++ b/device.mk
@@ -14,6 +14,9 @@
14# limitations under the License. 14# limitations under the License.
15# 15#
16 16
17# Audio Post Processing Engine (APPE)
18APPE_AUDIO := false
19
17ifeq ($(TARGET_PREBUILT_KERNEL),) 20ifeq ($(TARGET_PREBUILT_KERNEL),)
18LOCAL_KERNEL := device/ti/am57xevm/kernel 21LOCAL_KERNEL := device/ti/am57xevm/kernel
19else 22else
@@ -44,8 +47,16 @@ PRODUCT_COPY_FILES += \
44 frameworks/native/data/etc/android.hardware.camera.front.xml:system/etc/permissions/android.hardware.camera.front.xml \ 47 frameworks/native/data/etc/android.hardware.camera.front.xml:system/etc/permissions/android.hardware.camera.front.xml \
45 48
46# Audio 49# Audio
50ifeq ($(APPE_AUDIO),true)
51PRODUCT_COPY_FILES += \
52 hardware/ti/radio/vis_sdk/packages/android/hal/mixer_paths.xml:system/etc/mixer_paths.xml
53else
54PRODUCT_COPY_FILES += \
55 device/ti/am57xevm/audio/primary/mixer_paths.xml:system/etc/mixer_paths.xml
56# device/ti/am57xevm/audio/primary/mixer_paths.xml:system/etc/mixer_paths.xml \
57# device/ti/am57xevm/audio/jamr3/jamr3_mixer_paths.xml:system/etc/jamr3_mixer_paths.xml
58
47PRODUCT_COPY_FILES += \ 59PRODUCT_COPY_FILES += \
48 device/ti/am57xevm/audio/primary/mixer_paths.xml:system/etc/mixer_paths.xml \
49 device/ti/am57xevm/audio/audio_policy.conf:system/etc/audio_policy.conf 60 device/ti/am57xevm/audio/audio_policy.conf:system/etc/audio_policy.conf
50 61
51# cpuset configuration 62# cpuset configuration
@@ -102,6 +113,12 @@ PRODUCT_PACKAGES += \
102# Audio HAL modules 113# Audio HAL modules
103PRODUCT_PACKAGES += audio.primary.am57x 114PRODUCT_PACKAGES += audio.primary.am57x
104PRODUCT_PACKAGES += audio.hdmi.am57x 115PRODUCT_PACKAGES += audio.hdmi.am57x
116
117# JAMR3 Audio HAL module
118# ifneq ($(APPE_AUDIO),true)
119# PRODUCT_PACKAGES += audio.jamr3.am57x
120# endif
121
105# BlueDroid a2dp Audio HAL module 122# BlueDroid a2dp Audio HAL module
106PRODUCT_PACKAGES += audio.a2dp.default 123PRODUCT_PACKAGES += audio.a2dp.default
107# Remote submix 124# Remote submix