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

Commit ceff2b0c authored by Rom Lemarchand's avatar Rom Lemarchand Committed by android-build-merger
Browse files

resolve merge conflicts of 1366cabc to stage-aosp-master. 

am: 8c64904f

* commit '8c64904f':
  qcom: audio: Fix missed msm8974 flags
parents b14d76b8 8c64904f

hal/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ ifneq ($(filter msm8974 msm8226 msm8084 msm8992 msm8994,$(TARGET_BOARD_PLATFORM) 
  # 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)),)