diff options
-rw-r--r-- | Android.mk | 2 | ||||
-rw-r--r-- | hal/Android.mk | 7 | ||||
-rw-r--r-- | hal/audio_extn/hfp.c | 2 | ||||
-rw-r--r-- | hal/msm8974/platform.c | 4 | ||||
-rw-r--r-- | hal/msm8974/platform.h | 6 | ||||
-rw-r--r-- | mm-audio/aenc-aac/qdsp6/Android.mk | 2 | ||||
-rw-r--r-- | mm-audio/aenc-amrnb/qdsp6/Android.mk | 2 | ||||
-rw-r--r-- | mm-audio/aenc-evrc/qdsp6/Android.mk | 2 | ||||
-rw-r--r-- | mm-audio/aenc-g711/qdsp6/Android.mk | 2 | ||||
-rw-r--r-- | mm-audio/aenc-qcelp13/qdsp6/Android.mk | 2 | ||||
-rw-r--r-- | post_proc/Android.mk | 6 | ||||
-rw-r--r-- | visualizer/Android.mk | 2 |
12 files changed, 21 insertions, 18 deletions
@@ -1,4 +1,4 @@ -ifneq ($(filter mpq8092 msm8960 msm8226 msm8x26 msm8610 msm8974 msm8x74 apq8084 msm8916 msm8994 msm8992 msm8909 msm8996 msm8952 msm8937 thorium msm8953 msmgold msm8998 sdm660 sdm845 sdm670 apq8098_latv,$(TARGET_BOARD_PLATFORM)),) +ifneq ($(filter mpq8092 msm8960 msm8226 msm8x26 msm8610 msm8974 msm8x74 apq8084 msm8916 msm8994 msm8992 msm8909 msm8996 msm8952 msm8937 thorium msm8953 msmgold msm8998 sdm660 sdm845 sdm670 apq8098_latv qcs605,$(TARGET_BOARD_PLATFORM)),) MY_LOCAL_PATH := $(call my-dir) diff --git a/hal/Android.mk b/hal/Android.mk index c8bfb104..9b320f01 100644 --- a/hal/Android.mk +++ b/hal/Android.mk @@ -8,7 +8,7 @@ LOCAL_ARM_MODE := arm AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM) -ifneq ($(filter msm8974 msm8226 msm8610 apq8084 msm8994 msm8992 msm8996 msm8998 apq8098_latv sdm845 sdm670,$(TARGET_BOARD_PLATFORM)),) +ifneq ($(filter msm8974 msm8226 msm8610 apq8084 msm8994 msm8992 msm8996 msm8998 apq8098_latv sdm845 sdm670 qcs605,$(TARGET_BOARD_PLATFORM)),) # B-family platform uses msm8974 code base AUDIO_PLATFORM = msm8974 MULTIPLE_HW_VARIANTS_ENABLED := true @@ -39,6 +39,9 @@ endif ifneq ($(filter sdm670,$(TARGET_BOARD_PLATFORM)),) LOCAL_CFLAGS := -DPLATFORM_SDM670 endif +ifneq ($(filter qcs605,$(TARGET_BOARD_PLATFORM)),) + LOCAL_CFLAGS := -DPLATFORM_QCS605 +endif endif ifneq ($(filter msm8916 msm8909 msm8952 msm8937 thorium msm8953 msmgold sdm660,$(TARGET_BOARD_PLATFORM)),) @@ -65,7 +68,7 @@ LOCAL_SRC_FILES += audio_extn/audio_extn.c \ LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/include LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr -ifneq ($(filter sdm670,$(TARGET_BOARD_PLATFORM)),) +ifneq ($(filter sdm670 qcs605,$(TARGET_BOARD_PLATFORM)),) LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include LOCAL_ADDITIONAL_DEPENDENCIES += $(BOARD_VENDOR_KERNEL_MODULES) endif diff --git a/hal/audio_extn/hfp.c b/hal/audio_extn/hfp.c index db511224..0d9f9ae6 100644 --- a/hal/audio_extn/hfp.c +++ b/hal/audio_extn/hfp.c @@ -55,7 +55,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ #define HFP_RX_VOLUME "SEC AUXPCM LOOPBACK Volume" #elif defined PLATFORM_MSM8996 #define HFP_RX_VOLUME "PRI AUXPCM LOOPBACK Volume" -#elif defined (PLATFORM_MSM8998) || defined (PLATFORM_MSMFALCON) || defined (PLATFORM_SDM845) || defined (PLATFORM_SDM670) +#elif defined (PLATFORM_MSM8998) || defined (PLATFORM_MSMFALCON) || defined (PLATFORM_SDM845) || defined (PLATFORM_SDM670) || defined (PLATFORM_QCS605) #define HFP_RX_VOLUME "SLIMBUS_7 LOOPBACK Volume" #else #define HFP_RX_VOLUME "Internal HFP RX Volume" diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c index 85ed12ae..79fb6e56 100644 --- a/hal/msm8974/platform.c +++ b/hal/msm8974/platform.c @@ -77,7 +77,7 @@ #endif #include <linux/msm_audio.h> -#if defined (PLATFORM_MSM8998) || (PLATFORM_SDM845) || (PLATFORM_SDM670) +#if defined (PLATFORM_MSM8998) || (PLATFORM_SDM845) || (PLATFORM_SDM670) || defined (PLATFORM_QCS605) #include <sound/devdep_params.h> #endif @@ -7640,7 +7640,7 @@ int platform_get_supported_sampling_rate_on_hdmi(uint32_t stream_sr) return sample_rate; } -#if defined (PLATFORM_MSM8998) || (PLATFORM_SDM845) || (PLATFORM_SDM670) +#if defined (PLATFORM_MSM8998) || (PLATFORM_SDM845) || (PLATFORM_SDM670) || defined (PLATFORM_QCS605) int platform_get_mmap_data_fd(void *platform, int fe_dev, int dir, int *fd, uint32_t *size) { diff --git a/hal/msm8974/platform.h b/hal/msm8974/platform.h index 4fa9442c..dd0f91fd 100644 --- a/hal/msm8974/platform.h +++ b/hal/msm8974/platform.h @@ -362,11 +362,11 @@ enum { #define PLAYBACK_OFFLOAD_DEVICE 9 // Direct_PCM -#if defined (PLATFORM_MSM8994) || defined (PLATFORM_MSM8996) || defined (PLATFORM_APQ8084) || defined (PLATFORM_MSM8998) || defined (PLATFORM_SDM845) || defined (PLATFORM_SDM670) +#if defined (PLATFORM_MSM8994) || defined (PLATFORM_MSM8996) || defined (PLATFORM_APQ8084) || defined (PLATFORM_MSM8998) || defined (PLATFORM_SDM845) || defined (PLATFORM_SDM670) ||defined (PLATFORM_QCS605) #define PLAYBACK_OFFLOAD_DEVICE2 17 #endif -#if defined (PLATFORM_APQ8084) || defined (PLATFORM_MSM8996) || defined (PLATFORM_MSM8998) || defined (PLATFORM_SDM845) || defined (PLATFORM_SDM670) +#if defined (PLATFORM_APQ8084) || defined (PLATFORM_MSM8996) || defined (PLATFORM_MSM8998) || defined (PLATFORM_SDM845) || defined (PLATFORM_SDM670) || defined(PLATFORM_QCS605) #define PLAYBACK_OFFLOAD_DEVICE3 18 #define PLAYBACK_OFFLOAD_DEVICE4 34 #define PLAYBACK_OFFLOAD_DEVICE5 35 @@ -491,7 +491,7 @@ enum { #define FM_RX_VOLUME "PRI MI2S LOOPBACK Volume" #elif PLATFORM_MSM8996 #define FM_RX_VOLUME "Tert MI2S LOOPBACK Volume" -#elif defined (PLATFORM_MSM8998) || defined (PLATFORM_SDM845) || defined (PLATFORM_MSMFALCON) || defined (PLATFORM_SDM670) +#elif defined (PLATFORM_MSM8998) || defined (PLATFORM_SDM845) || defined (PLATFORM_MSMFALCON) || defined (PLATFORM_SDM670) || defined (PLATFORM_QCS605) #define FM_RX_VOLUME "SLIMBUS_8 LOOPBACK Volume" #else #define FM_RX_VOLUME "Internal FM RX Volume" diff --git a/mm-audio/aenc-aac/qdsp6/Android.mk b/mm-audio/aenc-aac/qdsp6/Android.mk index 2c169b6e..b4272339 100644 --- a/mm-audio/aenc-aac/qdsp6/Android.mk +++ b/mm-audio/aenc-aac/qdsp6/Android.mk @@ -39,7 +39,7 @@ LOCAL_SRC_FILES += src/omx_aac_aenc.cpp LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/include LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr -ifneq ($(filter sdm670,$(TARGET_BOARD_PLATFORM)),) +ifneq ($(filter sdm670 qcs605,$(TARGET_BOARD_PLATFORM)),) LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include LOCAL_ADDITIONAL_DEPENDENCIES += $(BOARD_VENDOR_KERNEL_MODULES) endif diff --git a/mm-audio/aenc-amrnb/qdsp6/Android.mk b/mm-audio/aenc-amrnb/qdsp6/Android.mk index e8e985b8..3fa619e0 100644 --- a/mm-audio/aenc-amrnb/qdsp6/Android.mk +++ b/mm-audio/aenc-amrnb/qdsp6/Android.mk @@ -39,7 +39,7 @@ LOCAL_SRC_FILES += src/omx_amr_aenc.cpp LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/include LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr -ifneq ($(filter sdm670,$(TARGET_BOARD_PLATFORM)),) +ifneq ($(filter sdm670 qcs605,$(TARGET_BOARD_PLATFORM)),) LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include LOCAL_ADDITIONAL_DEPENDENCIES += $(BOARD_VENDOR_KERNEL_MODULES) endif diff --git a/mm-audio/aenc-evrc/qdsp6/Android.mk b/mm-audio/aenc-evrc/qdsp6/Android.mk index 49384a45..03965cbb 100644 --- a/mm-audio/aenc-evrc/qdsp6/Android.mk +++ b/mm-audio/aenc-evrc/qdsp6/Android.mk @@ -39,7 +39,7 @@ LOCAL_SRC_FILES += src/omx_evrc_aenc.cpp LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/include LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr -ifneq ($(filter sdm670,$(TARGET_BOARD_PLATFORM)),) +ifneq ($(filter sdm670 qcs605,$(TARGET_BOARD_PLATFORM)),) LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include LOCAL_ADDITIONAL_DEPENDENCIES += $(BOARD_VENDOR_KERNEL_MODULES) endif diff --git a/mm-audio/aenc-g711/qdsp6/Android.mk b/mm-audio/aenc-g711/qdsp6/Android.mk index 97e105c0..6b2b4533 100644 --- a/mm-audio/aenc-g711/qdsp6/Android.mk +++ b/mm-audio/aenc-g711/qdsp6/Android.mk @@ -40,7 +40,7 @@ LOCAL_SRC_FILES += src/omx_log.cpp LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/include LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr -ifneq ($(filter sdm670,$(TARGET_BOARD_PLATFORM)),) +ifneq ($(filter sdm670 qcs605,$(TARGET_BOARD_PLATFORM)),) LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include LOCAL_ADDITIONAL_DEPENDENCIES += $(BOARD_VENDOR_KERNEL_MODULES) endif diff --git a/mm-audio/aenc-qcelp13/qdsp6/Android.mk b/mm-audio/aenc-qcelp13/qdsp6/Android.mk index 9071eb3b..f4b904a5 100644 --- a/mm-audio/aenc-qcelp13/qdsp6/Android.mk +++ b/mm-audio/aenc-qcelp13/qdsp6/Android.mk @@ -39,7 +39,7 @@ LOCAL_SRC_FILES += src/omx_qcelp13_aenc.cpp LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/include LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr -ifneq ($(filter sdm670,$(TARGET_BOARD_PLATFORM)),) +ifneq ($(filter sdm670 qcs605,$(TARGET_BOARD_PLATFORM)),) LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include LOCAL_ADDITIONAL_DEPENDENCIES += $(BOARD_VENDOR_KERNEL_MODULES) endif diff --git a/post_proc/Android.mk b/post_proc/Android.mk index 314a73d9..86a2ab18 100644 --- a/post_proc/Android.mk +++ b/post_proc/Android.mk @@ -52,7 +52,7 @@ LOCAL_C_INCLUDES := \ $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/include \ $(call include-path-for, audio-effects) -ifneq ($(filter sdm670,$(TARGET_BOARD_PLATFORM)),) +ifneq ($(filter sdm670 qcs605,$(TARGET_BOARD_PLATFORM)),) LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include LOCAL_ADDITIONAL_DEPENDENCIES += $(BOARD_VENDOR_KERNEL_MODULES) endif @@ -89,7 +89,7 @@ endif ################################################################################ -ifneq ($(filter msm8992 msm8994 msm8996 msm8998 sdm660 sdm845 apq8098_latv sdm670,$(TARGET_BOARD_PLATFORM)),) +ifneq ($(filter msm8992 msm8994 msm8996 msm8998 sdm660 sdm845 apq8098_latv sdm670 qcs605,$(TARGET_BOARD_PLATFORM)),) include $(CLEAR_VARS) @@ -121,7 +121,7 @@ LOCAL_C_INCLUDES := \ hardware/qcom/audio/hal/audio_extn \ external/tinycompress/include -ifneq ($(filter sdm670,$(TARGET_BOARD_PLATFORM)),) +ifneq ($(filter sdm670 qcs605,$(TARGET_BOARD_PLATFORM)),) LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include LOCAL_ADDITIONAL_DEPENDENCIES += $(BOARD_VENDOR_KERNEL_MODULES) endif diff --git a/visualizer/Android.mk b/visualizer/Android.mk index af4bea46..d932ce08 100644 --- a/visualizer/Android.mk +++ b/visualizer/Android.mk @@ -21,7 +21,7 @@ LOCAL_SRC_FILES:= \ LOCAL_CFLAGS+= -O2 -fvisibility=hidden -ifneq ($(filter sdm660 sdm845 msm8998 apq8098_latv sdm670,$(TARGET_BOARD_PLATFORM)),) +ifneq ($(filter sdm660 sdm845 msm8998 apq8098_latv sdm670 qcs605,$(TARGET_BOARD_PLATFORM)),) LOCAL_CFLAGS += -DCAPTURE_DEVICE=7 endif |