commit d00b024e46d9b72f1bcb90812cf7ff860974a6d4
author Rom Lemarchand <romlem@android.com> Wed Nov 18 17:53:24 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 18 17:53:24 2015 +0000
tree bd23b738963d818cc4888383accc36c6e31fc9f6
parent 2928b9e8d83caeda0942333876179b18dcdabb62
parent ceff2b0c0e8ec0a9e28148f47d7d305937ef6bcf

resolve merge conflicts of 1366cabc3d to stage-aosp-master. am: 8c64904f61
am: ceff2b0c0e

* commit 'ceff2b0c0e8ec0a9e28148f47d7d305937ef6bcf':
  qcom: audio: Fix missed msm8974 flags

hal/Android.mk

diff --git a/hal/Android.mk b/hal/Android.mk
index 35dcbb9..d482e97 100644
--- a/hal/Android.mk
+++ b/hal/Android.mk
@@ -14,6 +14,7 @@
   # B-family platform uses msm8974 code base
   AUDIO_PLATFORM = msm8974
 ifneq ($(filter msm8974,$(TARGET_BOARD_PLATFORM)),)
+  LOCAL_CFLAGS := -DPLATFORM_MSM8974
   LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="2"
 endif
 ifneq ($(filter msm8226,$(TARGET_BOARD_PLATFORM)),)