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

Commit f9abeb56 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4937098 from cb9b39f6 to pi-qpr1-release 

Change-Id: I3d3ca9c07e442d3b8e3d332d611addf7f6fcfc91
parents 7964549e cb9b39f6

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

hal/audio_hw.c

+4 −0
Original line number Diff line number Diff line
@@ -1373,6 +1373,10 @@ int select_devices(struct audio_device *adev, 
            out_snd_device = SND_DEVICE_OUT_SPEAKER;

    }



    if (usecase->id == USECASE_INCALL_MUSIC_UPLINK) {

        out_snd_device = SND_DEVICE_OUT_VOICE_MUSIC_TX;

    }



    if (out_snd_device != SND_DEVICE_NONE &&

            out_snd_device != adev->last_logged_snd_device[uc_id][0]) {

        ALOGD("%s: changing use case %s output device from(%d: %s, acdb %d) to (%d: %s, acdb %d)",

hal/msm8916/platform.c

+2 −0
Original line number Diff line number Diff line
@@ -232,6 +232,7 @@ static const char * const device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES] = "voice-tty-vco-headphones",

    [SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET] = "voice-tty-hco-handset",

    [SND_DEVICE_OUT_VOICE_TX] = "voice-tx",

    [SND_DEVICE_OUT_VOICE_MUSIC_TX] = "voice-music-tx",

    [SND_DEVICE_OUT_AFE_PROXY] = "afe-proxy",

    [SND_DEVICE_OUT_USB_HEADSET] = "usb-headphones",

    [SND_DEVICE_OUT_USB_HEADPHONES] = "usb-headphones",
@@ -326,6 +327,7 @@ static int acdb_device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES] = 17,

    [SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET] = 37,

    [SND_DEVICE_OUT_VOICE_TX] = 45,

    [SND_DEVICE_OUT_VOICE_MUSIC_TX] = 3,

    [SND_DEVICE_OUT_AFE_PROXY] = 0,

    [SND_DEVICE_OUT_USB_HEADSET] = 45,

    [SND_DEVICE_OUT_VOICE_USB_HEADSET] = 45,

hal/msm8916/platform.h

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ enum { 
    SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES,

    SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET,

    SND_DEVICE_OUT_VOICE_TX,

    SND_DEVICE_OUT_VOICE_MUSIC_TX,

    SND_DEVICE_OUT_AFE_PROXY,

    SND_DEVICE_OUT_USB_HEADSET,

    SND_DEVICE_OUT_USB_HEADPHONES,