diff options
| author | Shruthi Krishna <skrish@codeaurora.org> | 2015-01-23 15:12:58 -0800 |
|---|---|---|
| committer | Shruthi Krishna <skrish@codeaurora.org> | 2015-01-23 15:12:58 -0800 |
| commit | 9b7e69036add5c75612f3b5c28fbc9b4e432e443 (patch) | |
| tree | c83a834fe872279609f27801018eaefd6f0a830e /Android.mk | |
| parent | ca4688b3030983b8eb20669cce68e51fed3cf564 (diff) | |
| parent | ae9ad12d974dca259577bdf096727113d97aae64 (diff) | |
| download | android_hardware_qcom_audio-9b7e69036add5c75612f3b5c28fbc9b4e432e443.tar.gz android_hardware_qcom_audio-9b7e69036add5c75612f3b5c28fbc9b4e432e443.tar.bz2 android_hardware_qcom_audio-9b7e69036add5c75612f3b5c28fbc9b4e432e443.zip | |
Merge tag 'AU_LINUX_ANDROID_LA.BF64.1.05.00.00.021.095' into merge_branch
AU_LINUX_ANDROID_LA.BF64.1.05.00.00.021.095 based on quic/aosp/LA.BF64.1
* tag 'AU_LINUX_ANDROID_LA.BF64.1.05.00.00.021.095': (30 commits)
audio: Reject incall record request when mode is not IN_CALL
mm-audio: aenc-aac: fix integer overflow for encoded buffer timestamp calculation
hal: Add support for parsing hdmi edid information for msm8992
hal: Fix glitch in audio playback during device switch
hal: add support to query hpx state using getparameter
hal: add all compressed formats for app type selection
hal: Performance mode during recording usecase
hal: fix null pointer de-reference
hal : add 8992 for msm8992 audio
post_proc: Support Headphone:X in offload and non tunnel modes
post_proc: Add support for non-tunnel DSP audio effects
audio: Avoid mute during AFE PROXY Usecase
hal: Fix DTS HPX Get parameters
hal: bug fixes for PCM offload
hal: Fix progress bar issue during compress offload playback
hal: Fix setting stream channel map properly
hardware/qcom/audio: Integrate Eagle framework for HeadphoneX
hal: Remove setting DAP bypass /DAP on from HAL
hal: Avoid resetting device to speaker for HDMI passthrough case
hal: Audio HAL / APM changes for HDMI passthrough
...
Conflicts:
Android.mk
hal/Android.mk
hal/audio_extn/audio_extn.h
hal/audio_extn/utils.c
hal/audio_hw.c
hal/voice.c
Change-Id: Ia92b2002486894e8711a48480324479fe114aeb6
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,4 +1,4 @@ -ifneq ($(filter mpq8092 msm8960 msm8226 msm8x26 msm8610 msm8974 msm8x74 apq8084 msm8916 msm8994 msm8909 thulium,$(TARGET_BOARD_PLATFORM)),) +ifneq ($(filter mpq8092 msm8960 msm8226 msm8x26 msm8610 msm8974 msm8x74 apq8084 msm8916 msm8994 msm8909 msm8909 thulium,$(TARGET_BOARD_PLATFORM)),) MY_LOCAL_PATH := $(call my-dir) |