Android 15.0.0 Release 6 (AP4A.241205.013)
-----BEGIN PGP SIGNATURE----- iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ1IssQAKCRDorT+BmrEO eO94AJ92jyZuJ1uq/njek2I7JdxbdXAg5ACeP/ehhxzfwZ3Z2/J44QJylqeByWo= =AFwD -----END PGP SIGNATURE----- gpgsig -----BEGIN PGP SIGNATURE----- iQJLBAABCgA1FiEEHrBYPudH862glXQBzJUERRm+ZmkFAmdY8ecXHG1rYmVzdGFz QGxpbmVhZ2Vvcy5vcmcACgkQzJUERRm+ZmmTKg/+PUN7P6yiBWzundIJndoZQ5i0 LhCxEtojWhQzz390aNOno3zvZo6vM4VKFIJoiep3WsZt4fCchEmocOCmwGZgel/W elBOMvviypvhv5jAEpK2JK4s7MUHaV+lxUgvFPIVNECTUKu2/UmlFXU808Mk7vUI h4L5BMp/ETdBCEoqBX7zOW4R0F/t27wwHPzqnFIxQiZufIIcMzaaHr6NETC+tWv6 Vs+6yIf43d5I6VLbbyTawO7tfYVHPEgatmCla3a6zXpZeYD6H1EklYg8pQJHYJZa T8zdoh1+d5Lg5b6Mzk3gEdQTJPfXwQlAz7xc//GA0xE2cFFJWjtYkO+3Qs2pdTAt z93JkIvx+XoOoEv8fincHoY/xH9thIib+6GU1W2bPn/aLNYtAFpEVVnmz+eBYHo1 kQ+grpiTny6zrBF5qlvMZFjHSQwg/hehOhiGBmjfhEpn1hrRh9LEEsjCj2gqjnpc zoBYtCKLG1u4Dt0ychx5OIi4HyWuuff48maNmiCaE96QS2ClNQOWK0HuLZAPcp68 zIrDLHpMua42bZ/Mkkwn0tLvyjg7HHUn00mgL15UVVdPzg+M9WWD6sr3QC5GnY+C O4CiTio36cyEWYRJcxUT83jdxiqMFldMybhDtwpMHOMEnbrQkPiNR/86jgRroj1O QB1J0yrwtY1v8wqmVLc= =cgBI -----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 # eO94AJ92jyZuJ1uq/njek2I7JdxbdXAg5ACeP/ehhxzfwZ3Z2/J44QJylqeByWo= # =AFwD # -----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 2484 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 (6) and others # Via Android Build Coastguard Worker (27) and others * tag 'android-15.0.0_r6': (27 commits) gps: set default SUPL SSL method to SSLv23 gps: Enable Beidou measurements only in the US for P21. Symlink current prebuilt folder to android root Update product id for oriole and raven oriole/raven: add etm modules in userdebug/eng builds move bootloader and radio build flag to device mk gps: Re-enable GLO & QZSS in US gps: add CpEarlyFixGuardTimeSec to prevent earlyfix response delay thermal: read thermistor temp from sysfs thermal:remove unused state2power value Update oriole SVN to 86 Update raven SVN to 86 thermal: Remove bcl related tzones update OWNERS to include Android.bp raviole: Add build_flags based properties for SMR/EMR build haptics: Update output distortion gain gps: Enable ExitOnComFailure Adpf:raviole: switch to multitier heuristic boost. Update oriole SVN to 85 Update raven SVN to 85 ... Conflicts: device-oriole.mk device-raven.mk oriole/BoardConfig.mk raven/BoardConfig.mk Change-Id: Ic9e494f17dcc35b9dab52908e7a66ebd6fbd0798
This commit is contained in:
Michael Bestas
commit
92bbd34b70
34 changed files with 718 additions and 973 deletions
|
|
@ -17,6 +17,14 @@
|
|||
# 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_ORIOLE_RADIO_DIR
|
||||
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_ORIOLE_RADIO_DIR)
|
||||
endif
|
||||
RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= pdk# Keep this for pdk TODO: b/327119000
|
||||
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)
|
||||
$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR))
|
||||
|
||||
|
||||
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_ORIOLE_VERSION)
|
||||
# Keeps flexibility for kasan and ufs builds
|
||||
TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_ORIOLE_DIR)
|
||||
|
|
@ -197,12 +205,31 @@ ifdef RELEASE_SVN_ORIOLE
|
|||
TARGET_SVN ?= $(RELEASE_SVN_ORIOLE)
|
||||
else
|
||||
# Set this for older releases that don't use build flag
|
||||
TARGET_SVN ?= 85
|
||||
TARGET_SVN ?= 86
|
||||
endif
|
||||
|
||||
PRODUCT_VENDOR_PROPERTIES += \
|
||||
ro.vendor.build.svn=$(TARGET_SVN)
|
||||
|
||||
# Set device family property for SMR builds
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
ro.build.device_family=O6R4B9
|
||||
|
||||
# Set build properties for SMR builds
|
||||
ifeq ($(RELEASE_IS_SMR), true)
|
||||
ifneq (,$(RELEASE_BASE_OS_ORIOLE))
|
||||
PRODUCT_BASE_OS := $(RELEASE_BASE_OS_ORIOLE)
|
||||
endif
|
||||
endif
|
||||
|
||||
# Set build properties for EMR builds
|
||||
ifeq ($(RELEASE_IS_EMR), true)
|
||||
ifneq (,$(RELEASE_BASE_OS_ORIOLE))
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
ro.build.version.emergency_base_os=$(RELEASE_BASE_OS_ORIOLE)
|
||||
endif
|
||||
endif
|
||||
|
||||
# Set support hide display cutout feature
|
||||
PRODUCT_PRODUCT_PROPERTIES += \
|
||||
ro.support_hide_display_cutout=true
|
||||
|
|
@ -253,8 +280,8 @@ PRODUCT_PACKAGES += \
|
|||
vendor.samsung_slsi.hardware.tetheroffload@1.1-service
|
||||
|
||||
# Override default distortion output gain according to UX experiments
|
||||
PRODUCT_PRODUCT_PROPERTIES += \
|
||||
vendor.audio.hapticgenerator.distortion.output.gain=0.5
|
||||
PRODUCT_VENDOR_PROPERTIES += \
|
||||
vendor.audio.hapticgenerator.distortion.output.gain=0.32
|
||||
|
||||
# RKPD
|
||||
PRODUCT_PRODUCT_PROPERTIES += \
|
||||
|
|
@ -288,11 +315,21 @@ PRODUCT_PRODUCT_PROPERTIES += \
|
|||
|
||||
# Location
|
||||
ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
|
||||
ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION)))
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/google/raviole/location/gps.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
|
||||
device/google/raviole/location/gps.6.1.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
|
||||
else
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/google/raviole/location/gps.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
|
||||
endif
|
||||
else
|
||||
ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION)))
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/google/raviole/location/gps_user.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
|
||||
device/google/raviole/location/gps_user.6.1.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
|
||||
else
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/google/raviole/location/gps_user.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
|
||||
endif
|
||||
endif
|
||||
|
||||
# Enable DeviceAsWebcam support
|
||||
|
|
@ -306,3 +343,15 @@ PRODUCT_PRODUCT_PROPERTIES += \
|
|||
|
||||
# Disable AVF Remote Attestation
|
||||
PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true
|
||||
|
||||
# Bluetooth device id
|
||||
# Oriole: 0x4106
|
||||
PRODUCT_PRODUCT_PROPERTIES += \
|
||||
bluetooth.device_id.product_id=16646
|
||||
|
||||
# ETM
|
||||
ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
|
||||
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
|
||||
$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
|
||||
endif
|
||||
endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue