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----- 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
This commit is contained in:
Michael Bestas
commit
3147681172
61 changed files with 9322 additions and 1271 deletions
106
device-shiba.mk
106
device-shiba.mk
|
|
@ -17,6 +17,17 @@
|
|||
# Restrict the visibility of Android.bp files to improve build analysis time
|
||||
$(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
|
||||
|
||||
ifdef RELEASE_GOOGLE_SHIBA_RADIO_DIR
|
||||
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_SHIBA_RADIO_DIR)
|
||||
endif
|
||||
ifdef RELEASE_GOOGLE_SHIBA_RADIOCFG_DIR
|
||||
RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_SHIBA_RADIOCFG_DIR)
|
||||
endif
|
||||
RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR ?= pdk# Keep this for pdk TODO: b/327119000
|
||||
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR)
|
||||
$(call soong_config_set,shusky_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR))
|
||||
|
||||
|
||||
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_SHIBA_VERSION)
|
||||
# Keeps flexibility for kasan and ufs builds
|
||||
TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_SHIBA_DIR)
|
||||
|
|
@ -24,13 +35,7 @@ TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_SHIBA_DIR)/kernel-headers
|
|||
|
||||
LOCAL_PATH := device/google/shusky
|
||||
|
||||
DEVICE_PAGE_AGNOSTIC ?= $(if $(filter %_pgagnostic,$(TARGET_PRODUCT)),true,false)
|
||||
|
||||
ifeq ($(DEVICE_PAGE_AGNOSTIC),true)
|
||||
TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
|
||||
TARGET_KERNEL_DIR := $(RELEASE_KERNEL_SHIBA_DIR)/16kb
|
||||
TARGET_RW_FILE_SYSTEM_TYPE := ext4
|
||||
else
|
||||
ifneq ($(TARGET_BOOTS_16K),true)
|
||||
PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_SHIBA_16K_DEVELOPER_OPTION)
|
||||
endif
|
||||
|
||||
|
|
@ -125,19 +130,31 @@ PRODUCT_COPY_FILES += \
|
|||
PRODUCT_PRODUCT_PROPERTIES += \
|
||||
ro.bluetooth.finder.supported=true
|
||||
|
||||
ifeq ($(USE_AUDIO_HAL_AIDL),true)
|
||||
# AIDL
|
||||
|
||||
# declare use of stereo spatialization
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
ro.audio.stereo_spatialization_enabled=true
|
||||
|
||||
else
|
||||
# HIDL
|
||||
|
||||
# Spatial Audio
|
||||
PRODUCT_PACKAGES += \
|
||||
libspatialaudio
|
||||
|
||||
# declare use of spatial audio
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
ro.audio.spatializer_enabled=true
|
||||
|
||||
# Sound Dose
|
||||
PRODUCT_PACKAGES += \
|
||||
android.hardware.audio.sounddose-vendor-impl \
|
||||
audio_sounddose_aoc
|
||||
|
||||
endif
|
||||
|
||||
# declare use of spatial audio
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
ro.audio.spatializer_enabled=true
|
||||
|
||||
# Audio CCA property
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
persist.vendor.audio.cca.enabled=false
|
||||
|
|
@ -287,16 +304,29 @@ include device/google/gs-common/gps/brcm/device.mk
|
|||
PRODUCT_COPY_FILES += \
|
||||
device/google/shusky/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer
|
||||
|
||||
# Location
|
||||
ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/google/shusky/location/lhd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
|
||||
device/google/shusky/location/scd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
|
||||
ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION)))
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/google/shusky/location/gps.6.1.xml.sb3:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
|
||||
else
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/google/shusky/location/lhd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
|
||||
device/google/shusky/location/scd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf \
|
||||
device/google/shusky/location/gps.xml.sb3:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
|
||||
endif
|
||||
else
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/google/shusky/location/lhd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
|
||||
device/google/shusky/location/scd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
|
||||
ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION)))
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/google/shusky/location/gps_user.6.1.xml.sb3:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
|
||||
else
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/google/shusky/location/lhd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
|
||||
device/google/shusky/location/scd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf \
|
||||
device/google/shusky/location/gps_user.xml.sb3:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
|
||||
endif
|
||||
endif
|
||||
|
||||
# Set zram size
|
||||
|
|
@ -371,17 +401,39 @@ PRODUCT_VENDOR_PROPERTIES += \
|
|||
ro.vendor.vibrator.hal.dbc.txlvlholdoffms=0 \
|
||||
ro.vendor.vibrator.hal.pm.activetimeout=5
|
||||
|
||||
# Override Output Distortion Gain
|
||||
PRODUCT_VENDOR_PROPERTIES += \
|
||||
vendor.audio.hapticgenerator.distortion.output.gain=0.38
|
||||
|
||||
# Increment the SVN for any official public releases
|
||||
ifdef RELEASE_SVN_SHIBA
|
||||
TARGET_SVN ?= $(RELEASE_SVN_SHIBA)
|
||||
else
|
||||
# Set this for older releases that don't use build flag
|
||||
TARGET_SVN ?= 35
|
||||
TARGET_SVN ?= 38
|
||||
endif
|
||||
|
||||
PRODUCT_VENDOR_PROPERTIES += \
|
||||
ro.vendor.build.svn=$(TARGET_SVN)
|
||||
|
||||
# Set device family property for SMR
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
ro.build.device_family=HK3SB3AK3
|
||||
|
||||
# Set build properties for SMR builds
|
||||
ifeq ($(RELEASE_IS_SMR), true)
|
||||
ifneq (,$(RELEASE_BASE_OS_SHIBA))
|
||||
PRODUCT_BASE_OS := $(RELEASE_BASE_OS_SHIBA)
|
||||
endif
|
||||
endif
|
||||
|
||||
# Set build properties for EMR builds
|
||||
ifeq ($(RELEASE_IS_EMR), true)
|
||||
ifneq (,$(RELEASE_BASE_OS_SHIBA))
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
ro.build.version.emergency_base_os=$(RELEASE_BASE_OS_SHIBA)
|
||||
endif
|
||||
endif
|
||||
# P23 Devices no longer need rlsservice
|
||||
PRODUCT_VENDOR_PROPERTIES += \
|
||||
persist.vendor.camera.rls_supported=false
|
||||
|
|
@ -424,9 +476,6 @@ PRODUCT_PRODUCT_PROPERTIES += \
|
|||
PRODUCT_VENDOR_PROPERTIES += \
|
||||
persist.vendor.camera.exif_reveal_make_model=true
|
||||
|
||||
# AVF assignable devices xml
|
||||
PRODUCT_PACKAGES += shusky_assignable_devices.xml
|
||||
|
||||
# Enable DeviceAsWebcam support
|
||||
PRODUCT_VENDOR_PROPERTIES += \
|
||||
ro.usb.uvc.enabled=true
|
||||
|
|
@ -448,4 +497,23 @@ $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modu
|
|||
endif
|
||||
|
||||
PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
|
||||
|
||||
ifneq ($(wildcard vendor/arm/mali/valhall),)
|
||||
PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := true
|
||||
endif
|
||||
|
||||
# Bluetooth device id
|
||||
# Shiba: 0x410E
|
||||
PRODUCT_PRODUCT_PROPERTIES += \
|
||||
bluetooth.device_id.product_id=16654
|
||||
|
||||
# Set support for LEA multicodec
|
||||
PRODUCT_PRODUCT_PROPERTIES += \
|
||||
bluetooth.core.le_audio.codec_extension_aidl.enabled=true
|
||||
|
||||
# LE Audio configuration scenarios
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/google/caimito/bluetooth/audio_set_scenarios.json:$(TARGET_COPY_OUT_VENDOR)/etc/aidl/le_audio/aidl_audio_set_scenarios.json
|
||||
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/google/caimito/bluetooth/audio_set_configurations.json:$(TARGET_COPY_OUT_VENDOR)/etc/aidl/le_audio/aidl_audio_set_configurations.json
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue