Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f5ff4b6 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "audio: Enable audio compile for 8953"

parents bf300152 942d1c6e

Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ MY_LOCAL_PATH := $(call my-dir) 


UAPI_OUT := $(OUT)/obj/vendor/qcom/opensource/audio-kernel/include



ifeq ($(call is-board-platform-in-list,sdm845 sdm670 qcs605),true)

ifeq ($(call is-board-platform-in-list,msm8953 sdm845 sdm670 qcs605),true)

$(shell mkdir -p $(UAPI_OUT)/linux;)

$(shell mkdir -p $(UAPI_OUT)/sound;)

$(shell rm -rf $(OUT)/obj/vendor/qcom/opensource/audio-kernel/ipc/Module.symvers)
@@ -23,7 +23,7 @@ include $(MY_LOCAL_PATH)/asoc/codecs/Android.mk 
include $(MY_LOCAL_PATH)/asoc/codecs/wcd934x/Android.mk

endif



ifeq ($(call is-board-platform-in-list,sdm670 qcs605),true)

ifeq ($(call is-board-platform-in-list,msm8953 sdm670 qcs605),true)

$(shell rm -rf $(OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/sdm660_cdc/Module.symvers)

$(shell rm -rf $(OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/msm_sdw/Module.symvers)

include $(MY_LOCAL_PATH)/asoc/codecs/sdm660_cdc/Android.mk

asoc/Android.mk

+3 −3
Original line number Diff line number Diff line
@@ -8,14 +8,14 @@ TARGET := sdm845 
AUDIO_SELECT  := CONFIG_SND_SOC_SDM845=m

endif



ifeq ($(call is-board-platform-in-list,sdm670 qcs605),true)

ifeq ($(call is-board-platform-in-list,msm8953 sdm670 qcs605),true)

TARGET := sdm670

AUDIO_SELECT  := CONFIG_SND_SOC_SDM670=m

endif



AUDIO_CHIPSET := audio

# Build/Package only in case of supported target

ifeq ($(call is-board-platform-in-list,sdm845 sdm670 qcs605),true)

ifeq ($(call is-board-platform-in-list,msm8953 sdm845 sdm670 qcs605),true)



LOCAL_PATH := $(call my-dir)
@@ -50,7 +50,7 @@ LOCAL_MODULE_DEBUG_ENABLE := true 
LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)

include $(DLKM_DIR)/AndroidKernelModule.mk

###########################################################

ifeq ($(call is-board-platform-in-list,sdm670 qcs605),true)

ifeq ($(call is-board-platform-in-list,msm8953 sdm670 qcs605),true)

include $(CLEAR_VARS)

LOCAL_MODULE              := $(AUDIO_CHIPSET)_cpe_lsm.ko

LOCAL_MODULE_KBUILD_NAME  := cpe_lsm_dlkm.ko

asoc/Kbuild

+5 −0
Original line number Diff line number Diff line
@@ -25,6 +25,11 @@ ifeq ($(KERNEL_BUILD), 0) 
		export

		INCS    +=  -include $(AUDIO_ROOT)/config/sdm670autoconf.h

	endif

	ifeq ($(CONFIG_ARCH_SDM450), y)

		include $(AUDIO_ROOT)/config/sdm670auto.conf

		export

		INCS    +=  -include $(AUDIO_ROOT)/config/sdm670autoconf.h

	endif

endif



# As per target team, build is done as follows:

asoc/codecs/Android.mk

+3 −3
Original line number Diff line number Diff line
@@ -7,13 +7,13 @@ ifeq ($(call is-board-platform,sdm845),true) 
AUDIO_SELECT  := CONFIG_SND_SOC_SDM845=m

endif



ifeq ($(call is-board-platform-in-list,sdm670 qcs605),true)

ifeq ($(call is-board-platform-in-list,msm8953 sdm670 qcs605),true)

AUDIO_SELECT  := CONFIG_SND_SOC_SDM670=m

endif



AUDIO_CHIPSET := audio

# Build/Package only in case of supported target

ifeq ($(call is-board-platform-in-list,sdm845 sdm670 qcs605),true)

ifeq ($(call is-board-platform-in-list,msm8953 sdm845 sdm670 qcs605),true)



LOCAL_PATH := $(call my-dir)
@@ -74,7 +74,7 @@ LOCAL_MODULE_DEBUG_ENABLE := true 
LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)

include $(DLKM_DIR)/AndroidKernelModule.mk

###########################################################

ifeq ($(call is-board-platform-in-list,sdm670 qcs605),true)

ifeq ($(call is-board-platform-in-list,msm8953 sdm670 qcs605),true)

include $(CLEAR_VARS)

LOCAL_MODULE              := $(AUDIO_CHIPSET)_wcd9335.ko

LOCAL_MODULE_KBUILD_NAME  := wcd9335_dlkm.ko

asoc/codecs/Kbuild

+5 −0
Original line number Diff line number Diff line
@@ -24,6 +24,11 @@ ifeq ($(KERNEL_BUILD), 0) 
		export

		INCS    +=  -include $(AUDIO_ROOT)/config/sdm670autoconf.h

	endif

	ifeq ($(CONFIG_ARCH_SDM450), y)

		include $(AUDIO_ROOT)/config/sdm670auto.conf

		export

		INCS    +=  -include $(AUDIO_ROOT)/config/sdm670autoconf.h

	endif

endif



# As per target team, build is done as follows: