Skip to content

Commit

Permalink
Import msm7630 audio HAL from jb_2.5.3 branch
Browse files Browse the repository at this point in the history
Squashed import of the following CAF commits:

a0947f8 audio/msm7630: Initial commit for MR1 Audio bringup.
67550d7 audio: compile only if TARGET_USES_QCOM_MM_AUDIO set to true
51e24b7 msm7630 : Propagate the flag value to status
4642b91 Remove audio_poliy.conf from msm7630
b982f5a audio/8655: Enabling LPA playback by adding AudioSessionOutLPA class
fef3c65 audio/msm8655: Fix for AAC recording failure.
eeae23f msm7630 : Send proper channleMask for getInputProfile()
fe2acf4 Update copyright to The Linux Foundation
4931e2c audio/msm7630: Add usb audio hal profile.
04bcc5f audio/msm7630: Fix for volume change during voice call
58de776 7x30 : Port heap mask change to ion
c0a97d0 audio/msm7630: Fix the issue of voice call when HDMI connected
223c325 audio/msm7630: Fix to enable TTY device
387befb audio/msm7630: Add latency support for LPA
701b6c6 audio/msm7630: Fix for routing camcorded encoded clip audio to wired headset
a20c757 audio/msm7630: Fix for back to back VOIP calls failure
8f6be8a audio/msm7630 : Stability issue with LPA play back.

Signed-off-by: Michael Bestas <[email protected]>
  • Loading branch information
mikeNG committed Sep 26, 2014
1 parent 7386af3 commit e14bf5b
Show file tree
Hide file tree
Showing 8 changed files with 8,215 additions and 0 deletions.
4 changes: 4 additions & 0 deletions legacy/Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ ifeq ($(strip $(BOARD_USES_ALSA_AUDIO)),true)
include $(AUDIO_HW_ROOT)/audiod/Android.mk
endif

ifeq ($(call is-board-platform,msm7630_surf),true)
include $(AUDIO_HW_ROOT)/msm7630/Android.mk
endif

ifeq ($(TARGET_BOARD_PLATFORM),msm8660)
include $(AUDIO_HW_ROOT)/msm8660/Android.mk
include $(AUDIO_HW_ROOT)/mm-audio/Android.mk
Expand Down
100 changes: 100 additions & 0 deletions legacy/msm7630/Android.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
ifneq ($(BUILD_TINY_ANDROID),true)
ifeq ($(strip $(TARGET_USES_QCOM_MM_AUDIO)),true)

#AUDIO_POLICY_TEST := true
#ENABLE_AUDIO_DUMP := true

LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)

LOCAL_SRC_FILES := \
AudioHardware.cpp \
audio_hw_hal.cpp

ifeq ($(BOARD_HAVE_BLUETOOTH),true)
LOCAL_CFLAGS += -DWITH_A2DP
endif

ifeq ($(BOARD_HAVE_QCOM_FM),true)
LOCAL_CFLAGS += -DWITH_QCOM_FM
endif

LOCAL_SHARED_LIBRARIES := \
libcutils \
libutils \
libmedia \
libaudioalsa \
libaudcal

ifneq ($(TARGET_SIMULATOR),true)
LOCAL_SHARED_LIBRARIES += libdl
endif

LOCAL_STATIC_LIBRARIES := \
libmedia_helper \
libaudiohw_legacy

ifeq ($(call is-board-platform,msm7630_surf),true)
LOCAL_MODULE := audio.primary.msm7630_surf
else ifeq ($(call is-board-platform,msm7630_fusion),true)
LOCAL_MODULE := audio.primary.msm7630_fusion
endif

LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
LOCAL_MODULE_TAGS := optional

LOCAL_CFLAGS += -fno-short-enums

LOCAL_C_INCLUDES := $(TARGET_OUT_HEADERS)/mm-audio/audio-alsa
LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/mm-audio/audcal
LOCAL_C_INCLUDES += hardware/libhardware/include
LOCAL_C_INCLUDES += hardware/libhardware_legacy/include
LOCAL_C_INCLUDES += frameworks/base/include
LOCAL_C_INCLUDES += system/core/include

LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr

include $(BUILD_SHARED_LIBRARY)


# The audio policy is implemented on top of legacy policy code
include $(CLEAR_VARS)

LOCAL_SRC_FILES := \
AudioPolicyManager.cpp \
audio_policy_hal.cpp

LOCAL_SHARED_LIBRARIES := \
libcutils \
libutils \
libmedia

LOCAL_STATIC_LIBRARIES := \
libmedia_helper \
libaudiopolicy_legacy

ifeq ($(call is-board-platform,msm7630_surf),true)
LOCAL_MODULE := audio_policy.msm7630_surf
else ifeq ($(call is-board-platform,msm7630_fusion),true)
LOCAL_MODULE := audio_policy.msm7630_fusion
endif

LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
LOCAL_MODULE_TAGS := optional

ifeq ($(BOARD_HAVE_BLUETOOTH),true)
LOCAL_CFLAGS += -DWITH_A2DP
endif

LOCAL_C_INCLUDES := hardware/libhardware_legacy/audio

LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr


include $(BUILD_SHARED_LIBRARY)


endif # TARGET_USES_QCOM_MM_AUDIO
endif # not BUILD_TINY_ANDROID
Loading

0 comments on commit e14bf5b

Please sign in to comment.