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

Commit cb9b39f6 authored by Bubble Fang's avatar Bubble Fang Committed by Android (Google) Code Review
Browse files

Merge "hal: enable audio_hw flag for sdm710 platform" into pi-dev

parents 66c4ecfa e56cd4bc

Android.mk

+1 −1
Original line number Diff line number Diff line 
# TODO:  Find a better way to separate build configs for ADP vs non-ADP devices

ifneq ($(TARGET_BOARD_AUTO),true)

  ifneq ($(filter msm8960 msm8226 msm8x26 msm8x84 msm8084 msm8992 msm8994 msm8996 msm8909 msm8952 msm8998 sdm845,$(TARGET_BOARD_PLATFORM)),)

  ifneq ($(filter msm8960 msm8226 msm8x26 msm8x84 msm8084 msm8992 msm8994 msm8996 msm8909 msm8952 msm8998 sdm845 sdm710,$(TARGET_BOARD_PLATFORM)),)



    MY_LOCAL_PATH := $(call my-dir)

hal/Android.mk

+9 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM) 
ifneq ($(filter msm8960,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="2"

endif

ifneq ($(filter msm8974 msm8226 msm8084 msm8992 msm8994 msm8996 msm8998 sdm845,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter msm8974 msm8226 msm8084 msm8992 msm8994 msm8996 msm8998 sdm845 sdm710,$(TARGET_BOARD_PLATFORM)),)

  # B-family platform uses msm8974 code base

  AUDIO_PLATFORM = msm8974

ifneq ($(filter msm8974,$(TARGET_BOARD_PLATFORM)),)
@@ -55,6 +55,13 @@ ifneq ($(filter sdm845,$(TARGET_BOARD_PLATFORM)),) 
  LOCAL_CFLAGS += -DINCALL_STEREO_CAPTURE_ENABLED

  MULTIPLE_HW_VARIANTS_ENABLED := true

endif

ifneq ($(filter sdm710,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_CFLAGS := -DPLATFORM_SDM710

  LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="4"

  LOCAL_CFLAGS += -DINCALL_MUSIC_ENABLED

  LOCAL_CFLAGS += -DINCALL_STEREO_CAPTURE_ENABLED

  MULTIPLE_HW_VARIANTS_ENABLED := true

endif

endif



ifneq ($(filter msm8916 msm8909 msm8952,$(TARGET_BOARD_PLATFORM)),)
@@ -171,7 +178,7 @@ ifeq ($(strip $(AUDIO_FEATURE_ENABLED_A2DP_OFFLOAD)),true) 
    LOCAL_SRC_FILES += audio_extn/a2dp.c

endif



ifneq ($(filter msm8992 msm8994 msm8996 msm8998 sdm845,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter msm8992 msm8994 msm8996 msm8998 sdm845 sdm710,$(TARGET_BOARD_PLATFORM)),)

  # push codec/mad calibration to HW dep node

  # applicable to msm8992/8994 or newer platforms

  LOCAL_CFLAGS += -DHWDEP_CAL_ENABLED

post_proc/Android.mk

+2 −2
Original line number Diff line number Diff line 
ifneq ($(filter msm8974 msm8226 msm8084 msm8992 msm8994 msm8996 msm8909 msm8998 sdm845,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter msm8974 msm8226 msm8084 msm8992 msm8994 msm8996 msm8909 msm8998 sdm845 sdm710,$(TARGET_BOARD_PLATFORM)),)



LOCAL_PATH:= $(call my-dir)
@@ -43,7 +43,7 @@ endif 


################################################################################



ifneq ($(filter msm8992 msm8994 msm8996 msm8909 msm8998 sdm845,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter msm8992 msm8994 msm8996 msm8909 msm8998 sdm845 sdm710,$(TARGET_BOARD_PLATFORM)),)



include $(CLEAR_VARS)