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

Commit 5dcf7dd4 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: msm: update makefiles for auto platform support"

parents 40248a9d e780bb9c

Android.mk

+3 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 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 sm6150_au msmnile_gvmq sdmshrike_au))

ifneq ($(TARGET_BOARD_AUTO),true)

$(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

$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/soc/Module.symvers)
@@ -32,14 +32,14 @@ endif 
endif



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

ifneq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile_au msmnile_gvmq sdmshrike_au))

ifneq ($(TARGET_BOARD_AUTO),true)

$(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)

ifneq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), sm6150_au))

ifneq ($(TARGET_BOARD_AUTO),true)

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

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

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

asoc/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
# 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 msmnile_gvmq sdmshrike_au))

ifeq ($(TARGET_BOARD_AUTO),true)

AUDIO_SELECT  := CONFIG_SND_SOC_SA8155=m

else

AUDIO_SELECT  := CONFIG_SND_SOC_SM8150=m
@@ -14,7 +14,7 @@ endif 


ifeq ($(call is-board-platform,$(MSMSTEPPE)),true)

TARGET := talos

ifeq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), sm6150_au))

ifeq ($(TARGET_BOARD_AUTO),true)

AUDIO_SELECT  := CONFIG_SND_SOC_SA6155=m

else

AUDIO_SELECT  := CONFIG_SND_SOC_SM6150=m

asoc/codecs/Android.mk

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


# 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 msmnile_gvmq))

ifeq ($(TARGET_BOARD_AUTO),true)

AUDIO_SELECT  := CONFIG_SND_SOC_SA8155=m

else

AUDIO_SELECT  := CONFIG_SND_SOC_SM8150=m
@@ -12,7 +12,7 @@ endif 
endif



ifeq ($(call is-board-platform,$(MSMSTEPPE)),true)

ifeq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), sm6150_au))

ifeq ($(TARGET_BOARD_AUTO),true)

AUDIO_SELECT  := CONFIG_SND_SOC_SA6155=m

else

AUDIO_SELECT  := CONFIG_SND_SOC_SM6150=m
@@ -60,7 +60,7 @@ KBUILD_OPTIONS += BOARD_PLATFORM=$(TARGET_BOARD_PLATFORM) 
KBUILD_OPTIONS += $(AUDIO_SELECT)

# Target specific build

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

ifneq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile_au sm6150_au msmnile_gvmq))

ifneq ($(TARGET_BOARD_AUTO),true)

include $(CLEAR_VARS)

LOCAL_MODULE              := $(AUDIO_CHIPSET)_wcd_core.ko

LOCAL_MODULE_KBUILD_NAME  := wcd_core_dlkm.ko

dsp/Android.mk

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


# 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 msmnile_gvmq sdmshrike_au))

ifeq ($(TARGET_BOARD_AUTO),true)

AUDIO_SELECT  := CONFIG_SND_SOC_SA8155=m

else

AUDIO_SELECT  := CONFIG_SND_SOC_SM8150=m
@@ -12,7 +12,7 @@ endif 
endif



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

ifeq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), sm6150_au))

ifeq ($(TARGET_BOARD_AUTO),true)

AUDIO_SELECT  := CONFIG_SND_SOC_SA6155=m

else

AUDIO_SELECT  := CONFIG_SND_SOC_SM6150=m
@@ -81,7 +81,7 @@ LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT) 
include $(DLKM_DIR)/AndroidKernelModule.mk

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

# target specific build

ifneq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile_au sm6150_au msmnile_gvmq sdmshrike_au))

ifneq ($(TARGET_BOARD_AUTO),true)

include $(CLEAR_VARS)

LOCAL_MODULE              := $(AUDIO_CHIPSET)_usf.ko

LOCAL_MODULE_KBUILD_NAME  := usf_dlkm.ko

ipc/Android.mk

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


# 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 msmnile_gvmq sdmshrike_au))

ifeq ($(TARGET_BOARD_AUTO),true)

AUDIO_SELECT  := CONFIG_SND_SOC_SA8155=m

else

AUDIO_SELECT  := CONFIG_SND_SOC_SM8150=m
@@ -12,7 +12,7 @@ endif 
endif



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

ifeq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), sm6150_au))

ifeq ($(TARGET_BOARD_AUTO),true)

AUDIO_SELECT  := CONFIG_SND_SOC_SA6155=m

else

AUDIO_SELECT  := CONFIG_SND_SOC_SM6150=m
@@ -65,7 +65,7 @@ LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT) 
include $(DLKM_DIR)/AndroidKernelModule.mk

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

ifeq ($(call is-board-platform-in-list,msmnile $(MSMSTEPPE) $(TRINKET)),true)

ifneq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile_au sm6150_au msmnile_gvmq sdmshrike_au))

ifneq ($(TARGET_BOARD_AUTO),true)

include $(CLEAR_VARS)

LOCAL_MODULE              := $(AUDIO_CHIPSET)_wglink.ko

LOCAL_MODULE_KBUILD_NAME  := wglink_dlkm.ko