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

Commit 5d579037 authored Mar 12, 2018 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Mar 12, 2018

Merge "ASoC: Change PRODUCT_OUT to OUT in Kbuild"

parents 175101e7 e61ddb01

asoc/Kbuild

+5 −5

Original line number	Diff line number	Diff line
		@@ -162,11 +162,11 @@ EXTRA_CFLAGS += -Wheader-guard
		endif

		ifeq ($(KERNEL_BUILD), 0)
		KBUILD_EXTRA_SYMBOLS +=$(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/dsp/Module.symvers
		KBUILD_EXTRA_SYMBOLS +=$(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/Module.symvers
		KBUILD_EXTRA_SYMBOLS +=$(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/wcd934x/Module.symvers
		KBUILD_EXTRA_SYMBOLS +=$(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/sdm660_cdc/Module.symvers
		KBUILD_EXTRA_SYMBOLS +=$(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/msm_sdw/Module.symvers
		KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/dsp/Module.symvers
		KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/Module.symvers
		KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/wcd934x/Module.symvers
		KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/sdm660_cdc/Module.symvers
		KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/msm_sdw/Module.symvers
		endif
		ifeq ($(KERNEL_BUILD), 1)
		obj-y += codecs/

asoc/codecs/Kbuild

+2 −2

Original line number	Diff line number	Diff line
		@@ -162,8 +162,8 @@ endif


		ifeq ($(KERNEL_BUILD), 0)
		KBUILD_EXTRA_SYMBOLS +=$(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/dsp/Module.symvers
		KBUILD_EXTRA_SYMBOLS +=$(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/soc/Module.symvers
		KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/dsp/Module.symvers
		KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/soc/Module.symvers
		endif

		ifeq ($(KERNEL_BUILD), 1)

dsp/Kbuild

+1 −1

Original line number	Diff line number	Diff line
		@@ -147,7 +147,7 @@ CDEFINES += -DMULTI_IF_NAME=\"$(CHIP_NAME)\"
		endif

		ifeq ($(KERNEL_BUILD), 0)
		KBUILD_EXTRA_SYMBOLS +=$(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/ipc/Module.symvers
		KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/ipc/Module.symvers
		endif

		ifeq ($(KERNEL_BUILD), 1)

dsp/codecs/Kbuild

+2 −2

Original line number	Diff line number	Diff line
		@@ -126,8 +126,8 @@ EXTRA_CFLAGS += -Wheader-guard
		endif

		ifeq ($(KERNEL_BUILD), 0)
		KBUILD_EXTRA_SYMBOLS +=$(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/dsp/Module.symvers
		KBUILD_EXTRA_SYMBOLS +=$(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/Module.symvers
		KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/dsp/Module.symvers
		KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/Module.symvers
		endif

		# Module information used by KBuild framework

ipc/Kbuild

+1 −1

Original line number	Diff line number	Diff line
		@@ -112,7 +112,7 @@ CDEFINES += -DANI_LITTLE_BYTE_ENDIAN \
		KBUILD_CPPFLAGS += $(CDEFINES)

		ifeq ($(KERNEL_BUILD), 0)
		KBUILD_EXTRA_SYMBOLS +=$(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/dsp/Module.symvers
		KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/dsp/Module.symvers
		endif

		# Currently, for versions of gcc which support it, the kernel Makefile