summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMisael Lopez Cruz2016-08-01 17:01:06 -0500
committerMisael Lopez Cruz2016-09-30 12:56:47 -0500
commit798260c7692199dfad81835bed85b5d60c8de51a (patch)
treed4132fcd8cb0e1224f20b91372a18e4e3263ae0c
parentddffbdf338dad728edc393b160a3edadfefd3a9e (diff)
downloaddevice-ti-jacinto6evm-798260c7692199dfad81835bed85b5d60c8de51a.tar.gz
device-ti-jacinto6evm-798260c7692199dfad81835bed85b5d60c8de51a.tar.xz
device-ti-jacinto6evm-798260c7692199dfad81835bed85b5d60c8de51a.zip
jacinto6evm: 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. Change-Id: Ia11bdf721255ebd19e5fcd59aea02e3f5465387a Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
-rw-r--r--audio/Android.mk5
-rw-r--r--device.mk17
2 files changed, 20 insertions, 2 deletions
diff --git a/audio/Android.mk b/audio/Android.mk
index 9e14b16..d73e0c1 100644
--- a/audio/Android.mk
+++ b/audio/Android.mk
@@ -13,4 +13,9 @@
13# limitations under the License. 13# limitations under the License.
14 14
15LOCAL_PATH := $(call my-dir) 15LOCAL_PATH := $(call my-dir)
16
17ifeq ($(APPE_AUDIO),true)
18include $(LOCAL_PATH)/hdmi/Android.mk
19else
16include $(call all-makefiles-under,$(LOCAL_PATH)) 20include $(call all-makefiles-under,$(LOCAL_PATH))
21endif
diff --git a/device.mk b/device.mk
index 3ae4a48..2879ba0 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/jacinto6evm/kernel 21LOCAL_KERNEL := device/ti/jacinto6evm/kernel
19else 22else
@@ -46,9 +49,16 @@ PRODUCT_COPY_FILES += \
46 frameworks/native/data/etc/android.hardware.camera.front.xml:system/etc/permissions/android.hardware.camera.front.xml \ 49 frameworks/native/data/etc/android.hardware.camera.front.xml:system/etc/permissions/android.hardware.camera.front.xml \
47 50
48# Audio 51# Audio
52ifeq ($(APPE_AUDIO),true)
53PRODUCT_COPY_FILES += \
54 hardware/ti/radio/vis_sdk/packages/android/hal/mixer_paths.xml:system/etc/mixer_paths.xml
55else
49PRODUCT_COPY_FILES += \ 56PRODUCT_COPY_FILES += \
50 device/ti/jacinto6evm/audio/primary/mixer_paths.xml:system/etc/mixer_paths.xml \ 57 device/ti/jacinto6evm/audio/primary/mixer_paths.xml:system/etc/mixer_paths.xml \
51 device/ti/jacinto6evm/audio/jamr3/jamr3_mixer_paths.xml:system/etc/jamr3_mixer_paths.xml \ 58 device/ti/jacinto6evm/audio/jamr3/jamr3_mixer_paths.xml:system/etc/jamr3_mixer_paths.xml
59endif
60
61PRODUCT_COPY_FILES += \
52 device/ti/jacinto6evm/audio/audio_policy.conf:system/etc/audio_policy.conf 62 device/ti/jacinto6evm/audio/audio_policy.conf:system/etc/audio_policy.conf
53 63
54# cpuset configuration 64# cpuset configuration
@@ -103,12 +113,15 @@ PRODUCT_PACKAGES += \
103 113
104# Audio HAL modules 114# Audio HAL modules
105PRODUCT_PACKAGES += audio.primary.jacinto6 115PRODUCT_PACKAGES += audio.primary.jacinto6
106PRODUCT_PACKAGES += audio.jamr3.jacinto6
107PRODUCT_PACKAGES += audio.hdmi.jacinto6 116PRODUCT_PACKAGES += audio.hdmi.jacinto6
108# BlueDroid a2dp Audio HAL module 117# BlueDroid a2dp Audio HAL module
109PRODUCT_PACKAGES += audio.a2dp.default 118PRODUCT_PACKAGES += audio.a2dp.default
110# Remote submix 119# Remote submix
111PRODUCT_PACKAGES += audio.r_submix.default 120PRODUCT_PACKAGES += audio.r_submix.default
121# JAMR3 Audio HAL module
122ifneq ($(APPE_AUDIO),true)
123PRODUCT_PACKAGES += audio.jamr3.jacinto6
124endif
112 125
113PRODUCT_PACKAGES += \ 126PRODUCT_PACKAGES += \
114 tinymix \ 127 tinymix \