-----BEGIN PGP SIGNATURE----- iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ1IssQAKCRDorT+BmrEO eNGxAKCRv3bjgHcOEQjVsHW2ngqYmpsq4QCfejuzhueEquVmLXY/t6cNVe/FF4A= =6wuL -----END PGP SIGNATURE----- gpgsig -----BEGIN PGP SIGNATURE----- iQJLBAABCgA1FiEEHrBYPudH862glXQBzJUERRm+ZmkFAmdY7DcXHG1rYmVzdGFz QGxpbmVhZ2Vvcy5vcmcACgkQzJUERRm+ZmnjOg/+NeluPk0Ydoz47zbXHKNPD7Mr Q2VybclFjaNIbmmtQwNYx/95S0clX+aoAyS9/WFAMpKpNVhKWWMBy1UXDtZlEka5 BA7FeJyb//ba5skMdrTxLfGtReTPzr8OcUh/F/1U+KT77uMnUX71Yq7oOrsnLSen Ij4bSMF3q1KWuR/xmLmJIl7t+u+bp2pHP1fteu2twJmz1ncbWTw6OxUl5VCquqsN BdbF2gCR4abVE7jJD6VEJS9nwJcXoa1gdt4y9ARDBMkcRQxvRES1p5Ezz32dSwgt F5VfXwydre2fTVL6VxMXHVcTVig0TAlkpa1Inuu94ElQg6mVK5sGh7ZwhE+gCZ4P wrElzU6mFc61VfFEdAnXkFHOW+eFw4FC5yiPhJjxqLbge8FBeVZczE9Fqhu/UxPu fA3taBNLchVb/qvl/WQtwI8HJz6kcoMFs2+WHak89PP9PLzBtC9YxtJQBKPXZLQt p3jk8+zEyRTFJMIyvKdscHjUYoWvmUHsmPNgGccSWRxPrIB6SPbGYyVDny+43Q1I StqVesNw55fqq68eIZWNwqm0w+EtVzvt8e6SFYx4of6nnr4S+xtAjbJ+MEhsusRk /IVblc3tkJ+WtiIUZQShbs0aMquOSpcS6dfT3uf+6i3fEp+mfCYMRa+OK3Xse8/U 0VrOzjzNkfNvto5FJAw= =IoQL -----END PGP SIGNATURE----- Merge tag 'android-15.0.0_r6' into staging/lineage-22.0_merge-android-15.0.0_r6 Android 15.0.0 Release 6 (AP4A.241205.013) # -----BEGIN PGP SIGNATURE----- # # iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ1IssQAKCRDorT+BmrEO # eNGxAKCRv3bjgHcOEQjVsHW2ngqYmpsq4QCfejuzhueEquVmLXY/t6cNVe/FF4A= # =6wuL # -----END PGP SIGNATURE----- # gpg: Signature made Fri Dec 6 00:44:01 2024 EET # gpg: using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78 # gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal] # gpg: initial-contribution@android.com: Verified 2483 signatures in the past # 3 years. Encrypted 4 messages in the past 2 years. # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 4340 D135 70EF 945E 8381 0964 E8AD 3F81 9AB1 0E78 # By James Huang (8) and others # Via Android Build Coastguard Worker (62) and others * tag 'android-15.0.0_r6': (92 commits) gps: Update official release 4.15.3_7_241024_R1 config on CT3 powerhint: enable auto_prefer_idle in games powerhint: port dvfs_headroom settings from p24 powerhint.json: enable gpu capacity signalling. comet: fix unexpected affinity setting. Adjust power button y value for light reveal Add Sony WF-1000XM5 to the LE audio allow list Display: Removed colordata calibration file from /device BT Offload: Using origin flag to control BT Offload feature bthal: disable thread dispatcher comet: Update APMg3 tuning files Add UWB overlay to comet device gps: Update L5 Path Delay Parameters for CT3 comet: Update APMg3 tuning files comet: fix bypass mode creation flow Revert^2 "Move PRODUCT_SHIPPING_API_LEVEL to define by device" Enable STResetTool on P24 gps: Update official release 4.15.3_6_240905_R2 config add support for bluetooth-low-energy-broadcast thread: disable hal service ... Conflicts: device-comet.mk location/user/gps.cfg location/userdebug/gps.cfg powerhint-comet.json Change-Id: Ic7869348c2d27a7da92371b1f1e3f3728d103460
117 lines
5 KiB
Makefile
117 lines
5 KiB
Makefile
#
|
|
# Copyright (C) 2020 The Android Open-Source Project
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
#
|
|
|
|
AUDIO_TABLE_FOLDER := comet
|
|
|
|
# Choose AIDL config by build flag.
|
|
ifeq ($(USE_AUDIO_HAL_AIDL),true)
|
|
PRODUCT_SOONG_NAMESPACES += device/google/comet/audio/$(AUDIO_TABLE_FOLDER)/aidl_config
|
|
PRODUCT_PACKAGES += audio_aidl_configs
|
|
|
|
else
|
|
# Platform Configuration for AudioHAL / SoundTriggerHAL
|
|
PRODUCT_COPY_FILES += \
|
|
device/google/comet/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_bluetooth_legacy_hal.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_bluetooth_legacy_hal.xml \
|
|
device/google/comet/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
|
|
device/google/comet/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_le_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_le_offload_disabled.xml \
|
|
device/google/comet/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_a2dp_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_a2dp_offload_disabled.xml \
|
|
device/google/comet/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
|
|
device/google/comet/audio/$(AUDIO_TABLE_FOLDER)/config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \
|
|
device/google/comet/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \
|
|
device/google/comet/audio/$(AUDIO_TABLE_FOLDER)/config/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml
|
|
|
|
# AudioEffectHAL Configuration
|
|
PRODUCT_COPY_FILES += \
|
|
device/google/comet/audio/$(AUDIO_TABLE_FOLDER)/config/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml
|
|
|
|
# Mixer Path Configuration for AudioHAL
|
|
PRODUCT_COPY_FILES += \
|
|
device/google/comet/audio/$(AUDIO_TABLE_FOLDER)/config/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml
|
|
endif
|
|
|
|
# Speaker firmware files
|
|
SPK_FIRMWARE_PATH := $(AUDIO_TABLE_FOLDER)/cs35l41/fw
|
|
SPK_FIRMWARE_FULL_PATH := device/google/comet/audio/$(SPK_FIRMWARE_PATH)
|
|
|
|
PRODUCT_COPY_FILES += $(call copy-files,$(wildcard $(SPK_FIRMWARE_FULL_PATH)/*),$(TARGET_COPY_OUT_VENDOR)/firmware)
|
|
|
|
# Audio tuning
|
|
PRODUCT_SOONG_NAMESPACES += device/google/comet/audio/$(AUDIO_TABLE_FOLDER)/tuning
|
|
PRODUCT_PACKAGES += \
|
|
recording.gatf \
|
|
smartfeature.gstf \
|
|
BLUETOOTH.dat \
|
|
HANDSFREE.dat \
|
|
HANDSET.dat \
|
|
HEADSET.dat \
|
|
mcps.dat \
|
|
waves_config.ini \
|
|
waves_preset.mps \
|
|
waves_config_nx.ini \
|
|
waves_preset_nx.mps \
|
|
compens_spk_l_1.conf \
|
|
compens_spk_l_2.conf \
|
|
compens_spk_r_1.conf \
|
|
compens_spk_r_2.conf \
|
|
downlink_bluetooth_headset_config.pb \
|
|
downlink_dock_config.pb \
|
|
downlink_external_speaker_config.pb \
|
|
downlink_handset_config.pb \
|
|
downlink_speaker_config.pb \
|
|
downlink_wired_headset_config.pb \
|
|
uplink_bluetooth_headset_aec_off_config.pb \
|
|
uplink_bluetooth_headset_aec_on_config.pb \
|
|
uplink_dock_aec_off_config.pb \
|
|
uplink_dock_aec_on_config.pb \
|
|
uplink_external_speaker_aec_off_config.pb \
|
|
uplink_external_speaker_aec_on_config.pb \
|
|
uplink_handset_aec_off_config.pb \
|
|
uplink_handset_aec_on_config.pb \
|
|
uplink_speaker_aec_off_config.pb \
|
|
uplink_speaker_aec_on_config.pb \
|
|
uplink_wired_headset_aec_off_config.pb \
|
|
uplink_wired_headset_aec_on_config.pb
|
|
|
|
|
|
# eng specific
|
|
PRODUCT_PACKAGES_ENG += \
|
|
BLUETOOTH.mods \
|
|
HANDSFREE.mods \
|
|
HANDSET.mods \
|
|
HEADSET.mods \
|
|
template.xml \
|
|
tuning_constraints_combination.xml \
|
|
test_config.ini \
|
|
test_preset.mps \
|
|
speaker_post_processing_volume_spec.xml
|
|
|
|
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
|
|
# Mixer Path Configuration for Audio Speaker Calibration Tool crus_sp_cal
|
|
PRODUCT_COPY_FILES += \
|
|
device/google/comet/audio/$(AUDIO_TABLE_FOLDER)/cs35l41/crus_sp_cal_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/crus_sp_cal_mixer_paths.xml
|
|
|
|
endif
|
|
|
|
# Offload spatializer config
|
|
PRODUCT_PACKAGES += \
|
|
vendor.google.whitechapel.audio.hal.effect.spatializer.base \
|
|
vendor.google.whitechapel.audio.hal.effect.spatializer.mode_2_ch \
|
|
vendor.google.whitechapel.audio.hal.effect.spatializer.mode_6_ch \
|
|
vendor.google.whitechapel.audio.hal.effect.spatializer.mode_xaural
|
|
|
|
# Waves nx config
|
|
PRODUCT_PACKAGES += \
|
|
libNX_Google_Pixel_Android
|