diff options
| author | qctecmdr <qctecmdr@localhost> | 2019-07-29 02:50:05 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-07-29 02:50:05 -0700 |
| commit | 237662b0a1a0d7a6903d9718bc599a09833a815f (patch) | |
| tree | 9e3eb20b42884036f848cd75aa095bfc6099466b /ipc | |
| parent | d6329e47b821125a2f55d08342860baee75a3884 (diff) | |
| parent | f53de7f9fb98f4236ab7aed20960a74702cb966e (diff) | |
| download | msm-extra-237662b0a1a0d7a6903d9718bc599a09833a815f.tar.gz | |
Merge "audio-driver: Update build files for sa6155"
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/Android.mk | 8 | ||||
| -rw-r--r-- | ipc/Kbuild | 12 |
2 files changed, 15 insertions, 5 deletions
diff --git a/ipc/Android.mk b/ipc/Android.mk index 7a2325fd..52ef0456 100644 --- a/ipc/Android.mk +++ b/ipc/Android.mk @@ -11,9 +11,13 @@ AUDIO_SELECT := CONFIG_SND_SOC_SM8150=m endif endif -ifeq ($(call is-board-platform,$(MSMSTEPPE) $(TRINKET)),true) +ifeq ($(call is-board-platform-in-list,$(MSMSTEPPE) $(TRINKET)),true) +ifeq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), sm6150_au)) +AUDIO_SELECT := CONFIG_SND_SOC_SA6155=m +else AUDIO_SELECT := CONFIG_SND_SOC_SM6150=m endif +endif ifeq ($(call is-board-platform,kona),true) AUDIO_SELECT := CONFIG_SND_SOC_KONA=m @@ -61,7 +65,7 @@ LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT) include $(DLKM_DIR)/AndroidKernelModule.mk ########################################################### ifeq ($(call is-board-platform-in-list,msmnile $(MSMSTEPPE) $(TRINKET)),true) -ifneq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile_au msmnile_gvmq)) +ifneq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile_au sm6150_au msmnile_gvmq)) include $(CLEAR_VARS) LOCAL_MODULE := $(AUDIO_CHIPSET)_wglink.ko LOCAL_MODULE_KBUILD_NAME := wglink_dlkm.ko @@ -16,9 +16,15 @@ endif ifeq ($(KERNEL_BUILD), 0) ifeq ($(CONFIG_ARCH_SM6150), y) - include $(AUDIO_ROOT)/config/sm6150auto.conf - export - INCS += -include $(AUDIO_ROOT)/config/sm6150autoconf.h + ifdef CONFIG_SND_SOC_SA6155 + include $(AUDIO_ROOT)/config/sa6155auto.conf + export + INCS += -include $(AUDIO_ROOT)/config/sa6155autoconf.h + else + include $(AUDIO_ROOT)/config/sm6150auto.conf + export + INCS += -include $(AUDIO_ROOT)/config/sm6150autoconf.h + endif endif ifeq ($(CONFIG_ARCH_TRINKET), y) include $(AUDIO_ROOT)/config/sm6150auto.conf |