Merge "Merge Android Pie into master" (4cc9812a) · Commits · e / os / android_hardware_qcom_audio

Android.mk

+1 −1

Original line number	Original line	Diff line number	Diff line
	# TODO: Find a better way to separate build configs for ADP vs non-ADP devices		# TODO: Find a better way to separate build configs for ADP vs non-ADP devices
	ifneq ($(TARGET_BOARD_AUTO),true)		ifneq ($(TARGET_BOARD_AUTO),true)
	ifneq ($(filter msm8960 msm8226 msm8x26 msm8x84 msm8084 msm8992 msm8994 msm8996 msm8909 msm8952 msm8998,$(TARGET_BOARD_PLATFORM)),)		ifneq ($(filter msm8960 msm8226 msm8x26 msm8x84 msm8084 msm8992 msm8994 msm8996 msm8909 msm8952 msm8998 sdm845,$(TARGET_BOARD_PLATFORM)),)

	MY_LOCAL_PATH := $(call my-dir)		MY_LOCAL_PATH := $(call my-dir)

hal/Android.mk

+43 −3

Original line number	Original line	Diff line number	Diff line
	@@ -10,7 +10,7 @@ AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM)
	ifneq ($(filter msm8960,$(TARGET_BOARD_PLATFORM)),)		ifneq ($(filter msm8960,$(TARGET_BOARD_PLATFORM)),)
	LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="2"		LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="2"
	endif		endif
	ifneq ($(filter msm8974 msm8226 msm8084 msm8992 msm8994 msm8996 msm8998,$(TARGET_BOARD_PLATFORM)),)		ifneq ($(filter msm8974 msm8226 msm8084 msm8992 msm8994 msm8996 msm8998 sdm845,$(TARGET_BOARD_PLATFORM)),)
	# B-family platform uses msm8974 code base		# B-family platform uses msm8974 code base
	AUDIO_PLATFORM = msm8974		AUDIO_PLATFORM = msm8974
	ifneq ($(filter msm8974,$(TARGET_BOARD_PLATFORM)),)		ifneq ($(filter msm8974,$(TARGET_BOARD_PLATFORM)),)
	@@ -39,12 +39,20 @@ ifneq ($(filter msm8996,$(TARGET_BOARD_PLATFORM)),)
	LOCAL_CFLAGS := -DPLATFORM_MSM8996		LOCAL_CFLAGS := -DPLATFORM_MSM8996
	LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="4"		LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="4"
	LOCAL_CFLAGS += -DKPI_OPTIMIZE_ENABLED		LOCAL_CFLAGS += -DKPI_OPTIMIZE_ENABLED
			LOCAL_CFLAGS += -DINCALL_MUSIC_ENABLED
	MULTIPLE_HW_VARIANTS_ENABLED := true		MULTIPLE_HW_VARIANTS_ENABLED := true
	endif		endif
	ifneq ($(filter msm8998,$(TARGET_BOARD_PLATFORM)),)		ifneq ($(filter msm8998,$(TARGET_BOARD_PLATFORM)),)
	LOCAL_CFLAGS := -DPLATFORM_MSM8998		LOCAL_CFLAGS := -DPLATFORM_MSM8998
	LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="4"		LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="4"
	LOCAL_CFLAGS += -DKPI_OPTIMIZE_ENABLED		LOCAL_CFLAGS += -DINCALL_MUSIC_ENABLED
			MULTIPLE_HW_VARIANTS_ENABLED := true
			endif
			ifneq ($(filter sdm845,$(TARGET_BOARD_PLATFORM)),)
			LOCAL_CFLAGS := -DPLATFORM_SDM845
			LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="4"
			LOCAL_CFLAGS += -DINCALL_MUSIC_ENABLED
			LOCAL_CFLAGS += -DINCALL_STEREO_CAPTURE_ENABLED
	MULTIPLE_HW_VARIANTS_ENABLED := true		MULTIPLE_HW_VARIANTS_ENABLED := true
	endif		endif
	endif		endif
	@@ -124,6 +132,10 @@ ifeq ($(strip $(AUDIO_FEATURE_SUPPORTED_EXTERNAL_BT)),true)
	LOCAL_CFLAGS += -DEXTERNAL_BT_SUPPORTED		LOCAL_CFLAGS += -DEXTERNAL_BT_SUPPORTED
	endif		endif

			ifeq ($(strip $(AUDIO_FEATURE_FLICKER_SENSOR_INPUT)),true)
			LOCAL_CFLAGS += -DFLICKER_SENSOR_INPUT
			endif

	ifeq ($(strip $(AUDIO_FEATURE_NO_AUDIO_OUT)),true)		ifeq ($(strip $(AUDIO_FEATURE_NO_AUDIO_OUT)),true)
	LOCAL_CFLAGS += -DNO_AUDIO_OUT		LOCAL_CFLAGS += -DNO_AUDIO_OUT
	endif		endif
	@@ -144,12 +156,22 @@ ifeq ($(strip $(AUDIO_FEATURE_ENABLED_SPKR_PROTECTION)),true)
	LOCAL_SRC_FILES += audio_extn/spkr_protection.c		LOCAL_SRC_FILES += audio_extn/spkr_protection.c
	endif		endif

			ifeq ($(strip $(AUDIO_FEATURE_ENABLED_CIRRUS_SPKR_PROTECTION)),true)
			LOCAL_CFLAGS += -DSPKR_PROT_ENABLED
			LOCAL_SRC_FILES += audio_extn/cirrus_playback.c
			endif

	ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DSM_FEEDBACK)),true)		ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DSM_FEEDBACK)),true)
	LOCAL_CFLAGS += -DDSM_FEEDBACK_ENABLED		LOCAL_CFLAGS += -DDSM_FEEDBACK_ENABLED
	LOCAL_SRC_FILES += audio_extn/dsm_feedback.c		LOCAL_SRC_FILES += audio_extn/dsm_feedback.c
	endif		endif

	ifneq ($(filter msm8992 msm8994 msm8996 msm8998,$(TARGET_BOARD_PLATFORM)),)		ifeq ($(strip $(AUDIO_FEATURE_ENABLED_A2DP_OFFLOAD)),true)
			LOCAL_CFLAGS += -DA2DP_OFFLOAD_ENABLED
			LOCAL_SRC_FILES += audio_extn/a2dp.c
			endif

			ifneq ($(filter msm8992 msm8994 msm8996 msm8998 sdm845,$(TARGET_BOARD_PLATFORM)),)
	# push codec/mad calibration to HW dep node		# push codec/mad calibration to HW dep node
	# applicable to msm8992/8994 or newer platforms		# applicable to msm8992/8994 or newer platforms
	LOCAL_CFLAGS += -DHWDEP_CAL_ENABLED		LOCAL_CFLAGS += -DHWDEP_CAL_ENABLED
	@@ -161,6 +183,24 @@ ifeq ($(strip $(AUDIO_FEATURE_ENABLED_SND_MONITOR)), true)
	LOCAL_SRC_FILES += audio_extn/sndmonitor.c		LOCAL_SRC_FILES += audio_extn/sndmonitor.c
	endif		endif


			ifeq ($(strip $(AUDIO_FEATURE_ENABLED_USB_SERVICE_INTERVAL)), true)
			LOCAL_CFLAGS += -DUSB_SERVICE_INTERVAL_ENABLED
			endif

			ifeq ($(strip $(AUDIO_FEATURE_ENABLED_MAXX_AUDIO)), true)
			LOCAL_CFLAGS += -DMAXXAUDIO_QDSP_ENABLED
			LOCAL_SRC_FILES += audio_extn/maxxaudio.c
			endif

			ifeq ($(strip $(AUDIO_FEATURE_ENABLED_BG_CAL)),true)
			LOCAL_CFLAGS += -DBG_CODEC_CAL
			endif

			LOCAL_SHARED_LIBRARIES += libbase libhidlbase libhwbinder libutils android.hardware.power@1.2 liblog

			LOCAL_SRC_FILES += audio_perf.cpp

	LOCAL_HEADER_LIBRARIES += libhardware_headers		LOCAL_HEADER_LIBRARIES += libhardware_headers

	LOCAL_MODULE := audio.primary.$(TARGET_BOARD_PLATFORM)		LOCAL_MODULE := audio.primary.$(TARGET_BOARD_PLATFORM)

hal/acdb.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -22,7 +22,7 @@
	#include <stdlib.h>		#include <stdlib.h>
	#include <stdbool.h>		#include <stdbool.h>
	#include <dlfcn.h>		#include <dlfcn.h>
	#include <cutils/log.h>		#include <log/log.h>
	#include <cutils/str_parms.h>		#include <cutils/str_parms.h>
	#include <system/audio.h>		#include <system/audio.h>
	#include <tinyalsa/asoundlib.h>		#include <tinyalsa/asoundlib.h>

hal/acdb.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -33,9 +33,11 @@ typedef int (acdb_init_v2_t)(char );
	typedef int (*acdb_init_t)();		typedef int (*acdb_init_t)();
	typedef void (*acdb_send_audio_cal_t)(int, int);		typedef void (*acdb_send_audio_cal_t)(int, int);
	typedef void (*acdb_send_voice_cal_t)(int, int);		typedef void (*acdb_send_voice_cal_t)(int, int);
			typedef int (acdb_get_audio_cal_t) (void , void , uint32_t);
	typedef int (*acdb_reload_vocvoltable_t)(int);		typedef int (*acdb_reload_vocvoltable_t)(int);
	typedef int (*acdb_send_gain_dep_cal_t)(int, int, int, int, int);		typedef int (*acdb_send_gain_dep_cal_t)(int, int, int, int, int);
	typedef int (*acdb_send_custom_top_t) (void);		typedef int (*acdb_send_custom_top_t) (void);
			typedef int (acdb_set_audio_cal_t) (void , void *, uint32_t);

	struct meta_key_list {		struct meta_key_list {
	struct listnode list;		struct listnode list;

hal/audio_extn/a2dp.c

0 → 100644

+1739 −0

File added.

Preview size limit exceeded, changes collapsed.