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

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

Merge "Initial Android target definition for msmsteppe"

parents dce5ddbc 6d74b706

Android.mk

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


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



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

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

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

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

$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/ipc/Module.symvers)
@@ -24,7 +24,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 msmnile),true)

ifeq ($(call is-board-platform-in-list,sdm670 msmnile $(MSMSTEPPE)),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
@@ -36,7 +36,7 @@ include $(MY_LOCAL_PATH)/asoc/codecs/sdm660_cdc/Android.mk 
include $(MY_LOCAL_PATH)/asoc/codecs/msm_sdw/Android.mk

endif



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

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

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

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

endif

asoc/Android.mk

+6 −1
Original line number Diff line number Diff line
@@ -18,9 +18,14 @@ TARGET := msmnile 
AUDIO_SELECT  := CONFIG_SND_SOC_SM8150=m

endif



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

TARGET := $(MSMSTEPPE)

AUDIO_SELECT  := CONFIG_SND_SOC_SM6150=m

endif



AUDIO_CHIPSET := audio

# Build/Package only in case of supported target

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

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



LOCAL_PATH := $(call my-dir)

asoc/Kbuild

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

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

	endif

	ifeq ($(CONFIG_ARCH_SDM640), y)

		include $(AUDIO_ROOT)/config/sm8150auto.conf

		export

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

	endif

	ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)

		include $(AUDIO_ROOT)/config/sm8150auto.conf

		export

asoc/codecs/Android.mk

+5 −1
Original line number Diff line number Diff line
@@ -15,9 +15,13 @@ ifeq ($(call is-board-platform,msmnile),true) 
AUDIO_SELECT  := CONFIG_SND_SOC_SM8150=m

endif



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

AUDIO_SELECT  := CONFIG_SND_SOC_SM6150=m

endif



AUDIO_CHIPSET := audio

# Build/Package only in case of supported target

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

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



LOCAL_PATH := $(call my-dir)

asoc/codecs/Kbuild

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

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

	endif

	ifeq ($(CONFIG_ARCH_SDM640), y)

		include $(AUDIO_ROOT)/config/sm8150auto.conf

		export

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

	endif

	ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)

		include $(AUDIO_ROOT)/config/sm8150auto.conf

		export