Merge "audio-driver: Update build files for LA automotive" (5a2bcfb4) · Commits · e / devices / android_kernel_oneplus_sm7250

Android.mk

+8 −1

Original line number	Diff line number	Diff line
		@@ -17,20 +17,27 @@ include $(MY_LOCAL_PATH)/include/uapi/Android.mk
		include $(MY_LOCAL_PATH)/ipc/Android.mk
		include $(MY_LOCAL_PATH)/dsp/Android.mk
		include $(MY_LOCAL_PATH)/dsp/codecs/Android.mk
		include $(MY_LOCAL_PATH)/soc/Android.mk
		include $(MY_LOCAL_PATH)/asoc/Android.mk
		include $(MY_LOCAL_PATH)/asoc/codecs/Android.mk
		endif

		ifeq ($(call is-board-platform-in-list,msmnile $(MSMSTEPPE) $(TRINKET)),true)
		ifneq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile_au))
		$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/wcd934x/Module.symvers)
		include $(MY_LOCAL_PATH)/asoc/codecs/wcd934x/Android.mk
		endif
		endif

		ifneq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile_au))
		include $(MY_LOCAL_PATH)/soc/Android.mk
		endif

		ifeq ($(call is-board-platform-in-list,msmnile),true)
		ifneq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile_au))
		$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/aqt1000/Module.symvers)
		include $(MY_LOCAL_PATH)/asoc/codecs/aqt1000/Android.mk
		endif
		endif

		ifeq ($(call is-board-platform-in-list,$(MSMSTEPPE) $(TRINKET)),true)
		$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/bolero/Module.symvers)

asoc/Android.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -5,8 +5,12 @@
		# Check if this driver needs be built for current target
		ifeq ($(call is-board-platform,msmnile),true)
		TARGET := msmnile
		ifeq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile_au))
		AUDIO_SELECT := CONFIG_SND_SOC_SA8155=m
		else
		AUDIO_SELECT := CONFIG_SND_SOC_SM8150=m
		endif
		endif

		ifeq ($(call is-board-platform,$(MSMSTEPPE)),true)
		TARGET := talos

asoc/Kbuild

+17 −4

Original line number	Diff line number	Diff line
		@@ -15,10 +15,16 @@ endif

		ifeq ($(KERNEL_BUILD), 0)
		ifeq ($(CONFIG_ARCH_SM8150), y)
		ifdef CONFIG_SND_SOC_SA8155
		include $(AUDIO_ROOT)/config/sa8155auto.conf
		export
		INCS += -include $(AUDIO_ROOT)/config/sa8155autoconf.h
		else
		include $(AUDIO_ROOT)/config/sm8150auto.conf
		export
		INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
		endif
		endif
		ifeq ($(CONFIG_ARCH_SM6150), y)
		include $(AUDIO_ROOT)/config/sm6150auto.conf
		export
		@@ -78,7 +84,6 @@ COMMON_INC := -I$(AUDIO_ROOT)/$(COMMON_DIR)

		# for SM8150 sound card driver
		ifdef CONFIG_SND_SOC_SM8150
		MACHINE_OBJS += sa8155.o
		MACHINE_OBJS += sm8150.o
		MACHINE_OBJS += machine_815x_init.o
		endif
		@@ -104,6 +109,11 @@ ifdef CONFIG_SND_SOC_LITO
		MACHINE_OBJS += kona.o
		endif

		# for sa8155 sound card driver
		ifdef CONFIG_SND_SOC_SA8155
		MACHINE_OBJS += sa8155.o
		endif

		ifdef CONFIG_SND_SOC_CPE
		CPE_LSM_OBJS += msm-cpe-lsm.o
		endif
		@@ -205,6 +215,9 @@ machine_dlkm-y := $(MACHINE_OBJS)
		obj-$(CONFIG_SND_SOC_LITO) += machine_dlkm.o
		machine_dlkm-y := $(MACHINE_OBJS)

		obj-$(CONFIG_SND_SOC_SA8155) += machine_dlkm.o
		machine_dlkm-y := $(MACHINE_OBJS)

		obj-$(CONFIG_SND_SOC_CPE) += cpe_lsm_dlkm.o
		cpe_lsm_dlkm-y := $(CPE_LSM_OBJS)

asoc/codecs/Android.mk

+12 −6

Original line number	Diff line number	Diff line
		@@ -4,8 +4,12 @@

		# Check if this driver needs be built for current target
		ifeq ($(call is-board-platform,msmnile),true)
		ifeq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile_au))
		AUDIO_SELECT := CONFIG_SND_SOC_SA8155=m
		else
		AUDIO_SELECT := CONFIG_SND_SOC_SM8150=m
		endif
		endif

		ifeq ($(call is-board-platform,$(MSMSTEPPE)),true)
		AUDIO_SELECT := CONFIG_SND_SOC_SM6150=m
		@@ -52,6 +56,7 @@ KBUILD_OPTIONS += BOARD_PLATFORM=$(TARGET_BOARD_PLATFORM)
		KBUILD_OPTIONS += $(AUDIO_SELECT)

		###########################################################
		ifneq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile_au))
		include $(CLEAR_VARS)
		LOCAL_MODULE := $(AUDIO_CHIPSET)_wcd_core.ko
		LOCAL_MODULE_KBUILD_NAME := wcd_core_dlkm.ko
		@@ -107,21 +112,22 @@ LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
		include $(DLKM_DIR)/AndroidKernelModule.mk
		###########################################################
		include $(CLEAR_VARS)
		LOCAL_MODULE := $(AUDIO_CHIPSET)_stub.ko
		LOCAL_MODULE_KBUILD_NAME := stub_dlkm.ko
		LOCAL_MODULE := $(AUDIO_CHIPSET)_mbhc.ko
		LOCAL_MODULE_KBUILD_NAME := mbhc_dlkm.ko
		LOCAL_MODULE_TAGS := optional
		LOCAL_MODULE_DEBUG_ENABLE := true
		LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
		include $(DLKM_DIR)/AndroidKernelModule.mk
		###########################################################
		endif
		############################################################
		include $(CLEAR_VARS)
		LOCAL_MODULE := $(AUDIO_CHIPSET)_mbhc.ko
		LOCAL_MODULE_KBUILD_NAME := mbhc_dlkm.ko
		LOCAL_MODULE := $(AUDIO_CHIPSET)_stub.ko
		LOCAL_MODULE_KBUILD_NAME := stub_dlkm.ko
		LOCAL_MODULE_TAGS := optional
		LOCAL_MODULE_DEBUG_ENABLE := true
		LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
		include $(DLKM_DIR)/AndroidKernelModule.mk
		###########################################################
		##########################################################
		include $(CLEAR_VARS)
		LOCAL_MODULE := $(AUDIO_CHIPSET)_hdmi.ko
		LOCAL_MODULE_KBUILD_NAME := hdmi_dlkm.ko

asoc/codecs/Kbuild

+9 −3

Original line number	Diff line number	Diff line
		@@ -15,10 +15,16 @@ endif

		ifeq ($(KERNEL_BUILD), 0)
		ifeq ($(CONFIG_ARCH_SM8150), y)
		ifdef CONFIG_SND_SOC_SA8155
		include $(AUDIO_ROOT)/config/sa8155auto.conf
		export
		INCS += -include $(AUDIO_ROOT)/config/sa8155autoconf.h
		else
		include $(AUDIO_ROOT)/config/sm8150auto.conf
		export
		INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
		endif
		endif
		ifeq ($(CONFIG_ARCH_SM6150), y)
		include $(AUDIO_ROOT)/config/sm6150auto.conf
		export