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

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

Merge "audio-driver: Update build files for auto LA-GVM"

parents 5257151b 4a6979f6

Android.mk

+3 −3
Original line number Diff line number Diff line
@@ -22,18 +22,18 @@ 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))

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

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

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

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

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

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

asoc/Android.mk

+1 −1
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))

ifeq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile_au msmnile_gvmq))

AUDIO_SELECT  := CONFIG_SND_SOC_SA8155=m

else

AUDIO_SELECT  := CONFIG_SND_SOC_SM8150=m

asoc/Kbuild

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

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

	endif

	ifeq ($(CONFIG_QTI_GVM), y)

		include $(AUDIO_ROOT)/config/gvmauto.conf

		export

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

	endif

endif



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

asoc/codecs/Android.mk

+2 −2
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))

ifeq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile_au msmnile_gvmq))

AUDIO_SELECT  := CONFIG_SND_SOC_SA8155=m

else

AUDIO_SELECT  := CONFIG_SND_SOC_SM8150=m
@@ -56,7 +56,7 @@ KBUILD_OPTIONS += BOARD_PLATFORM=$(TARGET_BOARD_PLATFORM) 
KBUILD_OPTIONS += $(AUDIO_SELECT)



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

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

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

include $(CLEAR_VARS)

LOCAL_MODULE              := $(AUDIO_CHIPSET)_wcd_core.ko

LOCAL_MODULE_KBUILD_NAME  := wcd_core_dlkm.ko

asoc/codecs/Kbuild

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

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

	endif

	ifeq ($(CONFIG_QTI_GVM), y)

		include $(AUDIO_ROOT)/config/gvmauto.conf

		export

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

	endif

endif



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