-----BEGIN PGP SIGNATURE----- iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ1IssQAKCRDorT+BmrEO eA+6AJ9td5VjDJVq6T/Hygpl87elpBZXaQCfcVw7EKAVOKJuzq1MCv9/F8+CKuY= =t83X -----END PGP SIGNATURE----- gpgsig -----BEGIN PGP SIGNATURE----- iQJLBAABCgA1FiEEHrBYPudH862glXQBzJUERRm+ZmkFAmdY7+YXHG1rYmVzdGFz QGxpbmVhZ2Vvcy5vcmcACgkQzJUERRm+ZmnkKhAAh9mwhtSR9E66CZPjEUP2GsRm RXNqSbnjyVevOmKmmaYh4zEbt9Hqr+CAX/sMvOwbDk2gyhy6SlEL19GIPHGyH8sy 6FbG9UorRtKoZVjNjWYMGCi/lsP8Yz8V/lPRGtCwXS+X9qJHW2FxGGWHKHvjyhTI zG4hXsKNZ9LzYr3EkmpP8kMXK2imwNPvfeoKTZSJnS9L3I0S7tJLfnqh5i65Du0F peNBH/gMhqb40BxmkIO2XJ8PNSp1ClM5FnbINu8067tNZ6ohElArka78sd19Vb/g fxfnemVy39lQVJ5boZ+h+FcYZy6Ap/ZDEzOQVDOwxJQNYgB2qckoL954bzPZawXN ZKqwD1jkOKZWwzrJyPFOp7wUyr8zoCyaZ2cPbGOEahez8z/txFPbiKtB+WfI/50e cphx3SvSJhY1TMiY/yzlz03+cIlIlycT9xnWRQ7spBIfKu5GcxeQ/V5DhidJL5q+ Pw5tM73wUT1GdEcc2xXrV5ESed6sjNo1RF4iGKUrbwz9mGjFBJgC2+ccejpe6awr pxouYfLXOo1sGzo7+8VYxH3BhMc0zb9OSuUvfk/KBR3M/ZTQSkZUohBvGqQhfhTh Pav75e3jiE18nOPohwMgKDWPc1OQ4zb87NWdvsBcOQ7t0n6KzRAeZX/ZGwUJlBoR L/bxIPMT0s65cAdAKew= =vZJ5 -----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 # eA+6AJ9td5VjDJVq6T/Hygpl87elpBZXaQCfcVw7EKAVOKJuzq1MCv9/F8+CKuY= # =t83X # -----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 Ankur Bakshi (22) and others # Via Android (Google) Code Review (45) and others * tag 'android-15.0.0_r6': (74 commits) gps: set default SUPL SSL method to SSLv23 display: update reduceBrightColorsStrength setting Skip to check prebuilt max page size in PDK release gps: Enable pulse-per-second feature audio: add uninisialized mixer control Update product id for Shiba and Husky Symlink current prebuilt folder to android root Fix cpu mask for big core audio: update AIDL configs and add spatializer configs powerhint: Update not available frequency to reflect its actual behavior Delete mapper4 manifest Update estimated WiFi power consumption value audio: power optimization for deepbuffer playback Enable auto prefer idle Set big core to group_cfs_skip_mask for sys group by default Switch bootloader and radio directory to control by build flag gps: Re-enable GLO & QZSS in US audio: fix the noise of raw-playback in 16kB page mode Fix the husky_car target path Update mismatched frequency for husky and shiba ... Conflicts: device-husky.mk device-shiba.mk Change-Id: Ia17a9de89f175644c280656a4c0b606c08af1902
94 lines
6.2 KiB
Makefile
94 lines
6.2 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 := shiba
|
|
|
|
# Choose AIDL config by build flag.
|
|
ifeq ($(USE_AUDIO_HAL_AIDL),true)
|
|
PRODUCT_SOONG_NAMESPACES += device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config
|
|
PRODUCT_PACKAGES += audio_aidl_configs
|
|
|
|
else
|
|
# Platform Configuration for AudioHAL / SoundTriggerHAL
|
|
PRODUCT_COPY_FILES += \
|
|
device/google/shusky/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/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
|
|
device/google/shusky/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/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \
|
|
device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \
|
|
device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
|
|
device/google/shusky/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/shusky/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/shusky/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/shusky/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/shusky/audio/$(SPK_FIRMWARE_PATH)
|
|
|
|
PRODUCT_COPY_FILES += $(call copy-files,$(wildcard $(SPK_FIRMWARE_FULL_PATH)/*),$(TARGET_COPY_OUT_VENDOR)/firmware)
|
|
|
|
# Audio tuning
|
|
PRODUCT_COPY_FILES += \
|
|
device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/bluenote/recording.gatf:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/recording.gatf \
|
|
device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/bluenote/smartfeature.gstf:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/smartfeature.gstf \
|
|
device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/BLUETOOTH.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/BLUETOOTH.dat \
|
|
device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HANDSFREE.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSFREE.dat \
|
|
device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HANDSET.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSET.dat \
|
|
device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HEADSET.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HEADSET.dat \
|
|
device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/mcps.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/mcps.dat \
|
|
device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/waves_config.ini:$(TARGET_COPY_OUT_VENDOR)/etc/waves_config.ini \
|
|
device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/waves_preset.mps:$(TARGET_COPY_OUT_VENDOR)/etc/waves_preset.mps
|
|
|
|
# userdebug specific
|
|
ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
|
|
PRODUCT_COPY_FILES += \
|
|
device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/BLUETOOTH.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/BLUETOOTH.mods \
|
|
device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HANDSFREE.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSFREE.mods \
|
|
device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HANDSET.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSET.mods \
|
|
device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HEADSET.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HEADSET.mods
|
|
|
|
#Bluenote files
|
|
PRODUCT_COPY_FILES += \
|
|
device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/bluenote/template.xml:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/template.xml \
|
|
device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/bluenote/tuning_constraints_combination.xml:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/tuning_constraints_combination.xml
|
|
|
|
# Mixer Path Configuration for Audio Speaker Calibration Tool crus_sp_cal
|
|
PRODUCT_COPY_FILES += \
|
|
device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/cs35l41/crus_sp_cal_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/crus_sp_cal_mixer_paths.xml
|
|
|
|
PRODUCT_COPY_FILES += \
|
|
device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/tests/test_config.ini:$(TARGET_COPY_OUT_VENDOR)/etc/test_config.ini \
|
|
device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/tests/test_preset.mps:$(TARGET_COPY_OUT_VENDOR)/etc/test_preset.mps
|
|
|
|
endif
|
|
|
|
ifeq ($(USE_AUDIO_HAL_AIDL),true)
|
|
# Offload spatializer config
|
|
PRODUCT_COPY_FILES += \
|
|
device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/base:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/base \
|
|
device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_2_ch:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_2_ch \
|
|
device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_6_ch:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_6_ch \
|
|
device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_xaural:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_xaural \
|
|
|
|
endif
|