summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorShruthi Krishna <skrish@codeaurora.org>2013-10-25 14:32:12 -0700
committerShruthi Krishna <skrish@codeaurora.org>2013-10-25 14:32:12 -0700
commitace1085d17123bd06b56c94d8c2c924e28976c22 (patch)
tree0f857a0ccc463065f6bc1b0de8018ba1564c73f3 /Android.mk
parent8cb771475014f91e30474ddff121836078dd71d7 (diff)
parentc75149615da1f80fc4cf0988548270aa524d7984 (diff)
downloadandroid_hardware_qcom_audio-ace1085d17123bd06b56c94d8c2c924e28976c22.tar.gz
android_hardware_qcom_audio-ace1085d17123bd06b56c94d8c2c924e28976c22.tar.bz2
android_hardware_qcom_audio-ace1085d17123bd06b56c94d8c2c924e28976c22.zip
Merge remote-tracking branch into aosp
audio/hal: Configure HDMI channels based on output stream channels hal: Fix for Tx Mute issue when a new call accepted while in call Level measurement in offloaded visualizer audio: Presentation time enhancements implement get_presentation_position() for offloaded outputs audio : add new TMUS MCC and MNC list audio : add new TMUS MCC and MNC list audio : add new TMUS MCC and MNC list add offloaded audio visualizer audio: compress offload enhancements audio: enable AAC offload audio: set cached volume before starting voice call audio: set cached volume before starting voice call Implement HAL API get_presentation_position hal: force stop after drain. hal: Add support for Tunnel mode audio playback Conflicts: Android.mk hal/audio_hw.c hal/audio_hw.h hal/msm8960/platform.c hal/msm8974/platform.c Change-Id: I0c66fd6bae9b4974e1791f4e848c775d389da3d0
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 111e2720..db74eaf4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -9,6 +9,7 @@ include $(MY_LOCAL_PATH)/hal/Android.mk
include $(MY_LOCAL_PATH)/voice_processing/Android.mk
include $(MY_LOCAL_PATH)/mm-audio/Android.mk
include $(MY_LOCAL_PATH)/policy_hal/Android.mk
+include $(MY_LOCAL_PATH)/visualizer/Android.mk
endif
endif