commit 8659a58e87eb5dc170427e90c5b1101d12149447
author Arne Coucheron <arco68@gmail.com> Sat Jan 05 00:47:14 2013 +0100
committer Steve Kondik <shade@chemlab.org> Sun Jan 20 23:37:28 2013 -0800
tree a44432173d9f99e9b9611dd06ac67a152a35aff6
parent c4e2cdd717e225f3b4dea44acdcbd55d42dea188

audio/msm7x30: Fix build in CM

Change-Id: I78fa2a67cc36e88d5866ecbe67dd3cdd6d58dde1

Android.mk

diff --git a/Android.mk b/Android.mk
index c304b61..7a0a25a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,9 +1,18 @@
-ifneq ($(filter msm8960,$(TARGET_BOARD_PLATFORM)),)
+ifneq ($(filter msm8960 msm7x30,$(TARGET_BOARD_PLATFORM)),)
 ifeq ($(TARGET_QCOM_AUDIO_VARIANT),caf)
-AUDIO_ROOT := $(call my-dir)
-include $(call all-subdir-makefiles)
+
+AUDIO_HW_ROOT := $(call my-dir)
+
+ifeq ($(strip $(BOARD_USES_ALSA_AUDIO)),true)
+    include $(AUDIO_HW_ROOT)/alsa_sound/Android.mk
+    include $(AUDIO_HW_ROOT)/libalsa-intf/Android.mk
 endif
+ifeq ($(TARGET_BOARD_PLATFORM),msm8960)
+    include $(AUDIO_HW_ROOT)/mm-audio/Android.mk
 endif
-ifeq ($(call is-board-platform,msm7630_surf),true)
-    include $(AUDIO_HW_ROOT)/msm7630/Android.mk
+ifeq ($(TARGET_BOARD_PLATFORM),msm7x30)
+    include $(AUDIO_HW_ROOT)/msm7x30/Android.mk
+endif
+
+endif
 endif