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

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

Merge "ASoC: config: Enable audio compilation for msm8937"

parents 6f1fc2bb 6a50f743

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,msm8953 sdm845 sdm670 qcs605),true)

ifeq ($(call is-board-platform-in-list,msm8953 msm8937 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,msm8953 sdm670 qcs605),true)

ifeq ($(call is-board-platform-in-list,msm8953 msm8937 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

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ TARGET := sdm670 
AUDIO_SELECT  := CONFIG_SND_SOC_SDM670=m

endif



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

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

TARGET := sdm450

AUDIO_SELECT  += CONFIG_SND_SOC_SDM450=m

AUDIO_SELECT  += CONFIG_SND_SOC_EXT_CODEC_SDM450=m
@@ -21,7 +21,7 @@ endif 


AUDIO_CHIPSET := audio

# Build/Package only in case of supported target

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

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



LOCAL_PATH := $(call my-dir)

asoc/codecs/Android.mk

+5 −5
Original line number Diff line number Diff line
@@ -11,14 +11,14 @@ ifeq ($(call is-board-platform-in-list,sdm670 qcs605),true) 
AUDIO_SELECT  := CONFIG_SND_SOC_SDM670=m

endif



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

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

AUDIO_SELECT  += CONFIG_SND_SOC_SDM450=m

AUDIO_SELECT  += CONFIG_SND_SOC_EXT_CODEC_SDM450=m

endif



AUDIO_CHIPSET := audio

# Build/Package only in case of supported target

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

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



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

include $(DLKM_DIR)/AndroidKernelModule.mk

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

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

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

include $(CLEAR_VARS)

LOCAL_MODULE              := $(AUDIO_CHIPSET)_wcd_cpe.ko

LOCAL_MODULE_KBUILD_NAME  := wcd_cpe_dlkm.ko
@@ -81,7 +81,7 @@ LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT) 
include $(DLKM_DIR)/AndroidKernelModule.mk

endif

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

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

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

include $(CLEAR_VARS)

LOCAL_MODULE              := $(AUDIO_CHIPSET)_wcd9335.ko

LOCAL_MODULE_KBUILD_NAME  := wcd9335_dlkm.ko
@@ -99,7 +99,7 @@ LOCAL_MODULE_DEBUG_ENABLE := true 
LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)

include $(DLKM_DIR)/AndroidKernelModule.mk

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

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

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

include $(CLEAR_VARS)

LOCAL_MODULE              := $(AUDIO_CHIPSET)_wsa881x_analog.ko

LOCAL_MODULE_KBUILD_NAME  := wsa881x_analog_dlkm.ko

asoc/codecs/sdm660_cdc/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


AUDIO_CHIPSET := audio

# Build/Package only in case of supported target

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

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



LOCAL_PATH := $(call my-dir)

dsp/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -11,13 +11,13 @@ ifeq ($(call is-board-platform-in-list,sdm670 qcs605),true) 
AUDIO_SELECT  := CONFIG_SND_SOC_SDM670=m

endif



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

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

AUDIO_SELECT  := CONFIG_SND_SOC_SDM450=m

endif



AUDIO_CHIPSET := audio

# Build/Package only in case of supported target

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

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



LOCAL_PATH := $(call my-dir)