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

Commit 71674010 authored May 07, 2019 by qctecmdr Committed by Gerrit - the friendly Code Review server May 07, 2019

Merge "Initial target definition for atoll"

parents dfab4867 e5f8db02

Android.mk

+2 −2

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 $(MSMSTEPPE) $(TRINKET)),true)
		ifeq ($(call is-board-platform-in-list,msm8953 sdm845 sdm670 qcs605 msmnile $(MSMSTEPPE) atoll $(TRINKET)),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)
		@@ -29,7 +29,7 @@ $(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codec
		include $(MY_LOCAL_PATH)/asoc/codecs/aqt1000/Android.mk
		endif

		ifeq ($(call is-board-platform-in-list,$(MSMSTEPPE) $(TRINKET)),true)
		ifeq ($(call is-board-platform-in-list,$(MSMSTEPPE) atoll $(TRINKET)),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

+1 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@ TARGET := msmnile
		AUDIO_SELECT := CONFIG_SND_SOC_SM8150=m
		endif

		ifeq ($(call is-board-platform,$(MSMSTEPPE)),true)
		ifeq ($(call is-board-platform-in-list,$(MSMSTEPPE) atoll),true)
		TARGET := talos
		AUDIO_SELECT := CONFIG_SND_SOC_SM6150=m
		endif

asoc/codecs/Android.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@ ifeq ($(call is-board-platform,msmnile),true)
		AUDIO_SELECT := CONFIG_SND_SOC_SM8150=m
		endif

		ifeq ($(call is-board-platform,$(MSMSTEPPE)),true)
		ifeq ($(call is-board-platform-in-list,$(MSMSTEPPE) atoll),true)
		AUDIO_SELECT := CONFIG_SND_SOC_SM6150=m
		endif

		@@ -25,7 +25,7 @@ endif

		AUDIO_CHIPSET := audio
		# Build/Package only in case of supported target
		ifeq ($(call is-board-platform-in-list,msm8953 sdm845 sdm670 qcs605 msmnile $(MSMSTEPPE) $(TRINKET)),true)
		ifeq ($(call is-board-platform-in-list,msm8953 sdm845 sdm670 qcs605 msmnile atoll $(MSMSTEPPE) $(TRINKET)),true)

		LOCAL_PATH := $(call my-dir)

asoc/codecs/bolero/Android.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -3,13 +3,13 @@
		# Assume no targets will be supported

		# Check if this driver needs be built for current target
		ifeq ($(call is-board-platform,$(MSMSTEPPE) $(TRINKET)),true)
		ifeq ($(call is-board-platform-in-list,$(MSMSTEPPE) atoll $(TRINKET)),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,$(MSMSTEPPE) $(TRINKET)),true)
		ifeq ($(call is-board-platform-in-list,$(MSMSTEPPE) atoll $(TRINKET)),true)

		LOCAL_PATH := $(call my-dir)

asoc/codecs/wcd934x/Android.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@ ifeq ($(call is-board-platform,msmnile),true)
		AUDIO_SELECT := CONFIG_SND_SOC_SM8150=m
		endif

		ifeq ($(call is-board-platform,$(MSMSTEPPE) $(TRINKET)),true)
		ifeq ($(call is-board-platform-in-list,$(MSMSTEPPE) atoll $(TRINKET)),true)
		AUDIO_SELECT := CONFIG_SND_SOC_SM6150=m
		endif

		@@ -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 msmnile $(MSMSTEPPE) $(TRINKET)),true)
		ifeq ($(call is-board-platform-in-list,msm8953 sdm845 sdm670 qcs605 msmnile atoll $(MSMSTEPPE) $(TRINKET)),true)

		LOCAL_PATH := $(call my-dir)