Unverified Commit 302af9c5 authored by dianlujitao's avatar dianlujitao Committed by pjgowtham
Browse files

nicky: Switch to QTI bt stack 

While at it (edit by @ pjgowtham)
* Import audio policy from hardware/qcom-caf and we don't care much about usb audio policy config
* audio_policy_configuration that we were using initially was wrong anyways, thus nuked from tree.
* Don't bother about audio with offload disabled
parent f73a71cf

BoardConfig.mk

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ USE_CUSTOM_AUDIO_POLICY := 1 


# Bluetooth

BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(DEVICE_PATH)/bluetooth/include

TARGET_USE_QTI_BT_STACK := true



# Bootloader

TARGET_BOOTLOADER_BOARD_NAME := sdm710

audio/audio_policy_configuration.xml

deleted100644 → 0
+0 −438

File deleted.

Preview size limit exceeded, changes collapsed.

bluetooth/include/bdroid_buildcfg.h

+3 −2
Original line number Diff line number Diff line
@@ -25,10 +25,11 @@ 
#define BTM_DEF_LOCAL_NAME "Nicky"

// Disables read remote device feature

#define MAX_ACL_CONNECTIONS   16

#define MAX_L2CAP_CHANNELS    16

#define MAX_L2CAP_CHANNELS    32

#define BLE_VND_INCLUDED   TRUE

#define GATT_MAX_PHY_CHANNEL  10

// skips conn update at conn completion

#define BT_CLEAN_TURN_ON_DISABLED 1

/* Increasing SEPs to 12 from 6 to support SHO/MCast i.e. two streams per codec */

#define AVDT_NUM_SEPS 12

#define AVDT_NUM_SEPS 35

#endif

device.mk

+6 −4
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ PRODUCT_PACKAGES += \ 
    audio.usb.default



PRODUCT_PACKAGES += \

    liba2dpoffload \

    libaudioalsa \

    libqcompostprocbundle \

    libqcomvisualizer \
@@ -96,21 +97,22 @@ PRODUCT_PACKAGES += \ 
AUDIO_HAL_DIR := hardware/qcom-caf/sm8350/audio



PRODUCT_COPY_FILES += \

    $(LOCAL_PATH)/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/audio_policy_configuration.xml \

    $(AUDIO_HAL_DIR)/configs/common/bluetooth_qti_hearing_aid_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_qti_hearing_aid_audio_policy_configuration.xml \

    $(AUDIO_HAL_DIR)/configs/sdm710/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/audio_policy_configuration.xml \

    $(AUDIO_HAL_DIR)/configs/common/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \

    $(AUDIO_HAL_DIR)/configs/common/bluetooth_qti_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_qti_audio_policy_configuration.xml \

    $(AUDIO_HAL_DIR)/configs/common/bluetooth_qti_hearing_aid_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_qti_hearing_aid_audio_policy_configuration.xml



PRODUCT_COPY_FILES += \

    $(AUDIO_HAL_DIR)/configs/sdm710/audio_output_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_output_policy.conf \

    $(AUDIO_HAL_DIR)/configs/sdm710/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \

    $(AUDIO_HAL_DIR)/configs/sdm710/audio_tuning_mixer.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio_tuning_mixer.txt \

    $(AUDIO_HAL_DIR)/configs/sdm710/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths.xml \

    $(AUDIO_HAL_DIR)/configs/sdm710/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_platform_info.xml \

    $(AUDIO_HAL_DIR)/configs/sdm710/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_platform_info.xml



PRODUCT_COPY_FILES += \

    $(call find-copy-subdir-files,*,$(LOCAL_PATH)/audio/,$(TARGET_COPY_OUT_VENDOR)/etc)



PRODUCT_COPY_FILES += \

    frameworks/av/services/audiopolicy/config/a2dp_in_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_in_audio_policy_configuration.xml \

    frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \

    frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \

    frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \

system_ext.prop

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ ro.af.client_heap_size_kbyte=7168 


# Bluetooth

persist.vendor.btstack.aac_frm_ctl.enabled=true

ro.bluetooth.library_name=libbluetooth_qti.so



# Charger

ro.charger.enable_suspend=true