From 02f00754120df27a23f3ebf7b073b870c711808f Mon Sep 17 00:00:00 2001
From: Abhiprayah Tiwari <abhipray@codeaurora.org>
Date: Mon, 14 Dec 2020 18:15:27 +0530
Subject: [PATCH] audio-kernel: Fix build time issue

audio modules take a significantly high amount of time to compile
in incremental builds. The export statement causes unnecessary
exports which leads to problem. Removing it and adding it in device
specific conf file to make it similar to lahaina, kona etc

Change-Id: Id9d452e8f62381129263f554b794c5144de456c0
---
 Makefile               |  3 ---
 config/gvmauto.conf    | 32 ++++++++++++++++----------------
 config/sa6155auto.conf | 36 ++++++++++++++++++------------------
 config/sa8155auto.conf | 32 ++++++++++++++++----------------
 4 files changed, 50 insertions(+), 53 deletions(-)

diff --git a/Makefile b/Makefile
index 7318b00428f4..d60a0236f5ee 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,6 @@
 ifneq ($(CONFIG_ARCH_QTI_VM), y)
 ifeq ($(CONFIG_QTI_QUIN_GVM), y)
 include $(srctree)/techpack/audio/config/gvmauto.conf
-export
 endif
 ifeq ($(CONFIG_ARCH_SDXPOORWILLS), y)
 include $(srctree)/techpack/audio/config/sdxpoorwillsauto.conf
@@ -27,11 +26,9 @@ include $(srctree)/techpack/audio/config/holiauto.conf
 endif
 ifeq ($(CONFIG_ARCH_SA8155), y)
 include $(srctree)/techpack/audio/config/sa8155auto.conf
-export
 endif
 ifeq ($(CONFIG_ARCH_SA6155), y)
 include $(srctree)/techpack/audio/config/sa6155auto.conf
-export
 endif
 endif
 # Use USERINCLUDE when you must reference the UAPI directories only.
diff --git a/config/gvmauto.conf b/config/gvmauto.conf
index a48bf2ebe193..175b1e510c2a 100755
--- a/config/gvmauto.conf
+++ b/config/gvmauto.conf
@@ -1,16 +1,16 @@
-CONFIG_MSM_QDSP6_APRV2_VM=m
-CONFIG_MSM_QDSP6_SSR=m
-CONFIG_MSM_ADSP_LOADER=m
-CONFIG_MSM_QDSP6_NOTIFIER=m
-CONFIG_SND_SOC_MSM_QDSP6V2_VM=m
-CONFIG_SND_SOC_QDSP6V2=m
-CONFIG_QTI_PP=m
-CONFIG_SND_HWDEP_ROUTING=m
-CONFIG_DTS_EAGLE=m
-CONFIG_DOLBY_DS2=m
-CONFIG_DOLBY_LICENSE=m
-CONFIG_SND_SOC_MSM_STUB=m
-CONFIG_SND_SOC_MSM_HDMI_CODEC_RX=m
-CONFIG_MSM_QDSP6V2_CODECS=m
-CONFIG_SND_EVENT=m
-CONFIG_SND_SOC_SA8155=m
\ No newline at end of file
+export CONFIG_MSM_QDSP6_APRV2_VM=m
+export CONFIG_MSM_QDSP6_SSR=m
+export CONFIG_MSM_ADSP_LOADER=m
+export CONFIG_MSM_QDSP6_NOTIFIER=m
+export CONFIG_SND_SOC_MSM_QDSP6V2_VM=m
+export CONFIG_SND_SOC_QDSP6V2=m
+export CONFIG_QTI_PP=m
+export CONFIG_SND_HWDEP_ROUTING=m
+export CONFIG_DTS_EAGLE=m
+export CONFIG_DOLBY_DS2=m
+export CONFIG_DOLBY_LICENSE=m
+export CONFIG_SND_SOC_MSM_STUB=m
+export CONFIG_SND_SOC_MSM_HDMI_CODEC_RX=m
+export CONFIG_MSM_QDSP6V2_CODECS=m
+export CONFIG_SND_EVENT=m
+export CONFIG_SND_SOC_SA8155=m
diff --git a/config/sa6155auto.conf b/config/sa6155auto.conf
index 39dfa98ea7f1..df917c3ebd25 100644
--- a/config/sa6155auto.conf
+++ b/config/sa6155auto.conf
@@ -1,18 +1,18 @@
-CONFIG_MSM_QDSP6_APRV2_RPMSG=m
-CONFIG_MSM_QDSP6_SSR=m
-CONFIG_MSM_ADSP_LOADER=m
-CONFIG_MSM_QDSP6_NOTIFIER=m
-CONFIG_SND_SOC_MSM_QDSP6V2_INTF=m
-CONFIG_QTI_PP=m
-CONFIG_SND_HWDEP_ROUTING=m
-CONFIG_DTS_EAGLE=m
-CONFIG_DOLBY_DS2=m
-CONFIG_DOLBY_LICENSE=m
-CONFIG_SND_SOC_MSM_STUB=m
-CONFIG_SND_SOC_MSM_HDMI_CODEC_RX=m
-CONFIG_MSM_QDSP6V2_CODECS=m
-CONFIG_SND_SOC_QDSP6V2=m
-CONFIG_SND_SOC_SA6155=m
-CONFIG_SOUNDWIRE=m
-CONFIG_SOUNDWIRE_MSTR_CTRL=m
-CONFIG_SND_EVENT=m
+export CONFIG_MSM_QDSP6_APRV2_RPMSG=m
+export CONFIG_MSM_QDSP6_SSR=m
+export CONFIG_MSM_ADSP_LOADER=m
+export CONFIG_MSM_QDSP6_NOTIFIER=m
+export CONFIG_SND_SOC_MSM_QDSP6V2_INTF=m
+export CONFIG_QTI_PP=m
+export CONFIG_SND_HWDEP_ROUTING=m
+export CONFIG_DTS_EAGLE=m
+export CONFIG_DOLBY_DS2=m
+export CONFIG_DOLBY_LICENSE=m
+export CONFIG_SND_SOC_MSM_STUB=m
+export CONFIG_SND_SOC_MSM_HDMI_CODEC_RX=m
+export CONFIG_MSM_QDSP6V2_CODECS=m
+export CONFIG_SND_SOC_QDSP6V2=m
+export CONFIG_SND_SOC_SA6155=m
+export CONFIG_SOUNDWIRE=m
+export CONFIG_SOUNDWIRE_MSTR_CTRL=m
+export CONFIG_SND_EVENT=m
diff --git a/config/sa8155auto.conf b/config/sa8155auto.conf
index e6506760a4d0..fc7057eb6c64 100644
--- a/config/sa8155auto.conf
+++ b/config/sa8155auto.conf
@@ -1,16 +1,16 @@
-CONFIG_MSM_QDSP6_APRV2_RPMSG=m
-CONFIG_MSM_QDSP6_SSR=m
-CONFIG_MSM_ADSP_LOADER=m
-CONFIG_MSM_QDSP6_NOTIFIER=m
-CONFIG_SND_SOC_MSM_QDSP6V2_INTF=m
-CONFIG_SND_SOC_QDSP6V2=m
-CONFIG_QTI_PP=m
-CONFIG_SND_HWDEP_ROUTING=m
-CONFIG_DTS_EAGLE=m
-CONFIG_DOLBY_DS2=m
-CONFIG_DOLBY_LICENSE=m
-CONFIG_SND_SOC_MSM_STUB=m
-CONFIG_SND_SOC_MSM_HDMI_CODEC_RX=m
-CONFIG_MSM_QDSP6V2_CODECS=m
-CONFIG_SND_EVENT=m
-CONFIG_SND_SOC_SA8155=m
+export CONFIG_MSM_QDSP6_APRV2_RPMSG=m
+export CONFIG_MSM_QDSP6_SSR=m
+export CONFIG_MSM_ADSP_LOADER=m
+export CONFIG_MSM_QDSP6_NOTIFIER=m
+export CONFIG_SND_SOC_MSM_QDSP6V2_INTF=m
+export CONFIG_SND_SOC_QDSP6V2=m
+export CONFIG_QTI_PP=m
+export CONFIG_SND_HWDEP_ROUTING=m
+export CONFIG_DTS_EAGLE=m
+export CONFIG_DOLBY_DS2=m
+export CONFIG_DOLBY_LICENSE=m
+export CONFIG_SND_SOC_MSM_STUB=m
+export CONFIG_SND_SOC_MSM_HDMI_CODEC_RX=m
+export CONFIG_MSM_QDSP6V2_CODECS=m
+export CONFIG_SND_EVENT=m
+export CONFIG_SND_SOC_SA8155=m