Android 15.0.0 release 5

-----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZyvedQAKCRDorT+BmrEO
 eJOIAJ0Wc9J+EhQWGMZKJn3yTlEG7XhK1wCdEdhFLCN0QU6PTdzsKNnDMx85jJ0=
 =z08M
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQJLBAABCgA1FiEEHrBYPudH862glXQBzJUERRm+ZmkFAmcsuKsXHG1rYmVzdGFz
 QGxpbmVhZ2Vvcy5vcmcACgkQzJUERRm+ZmnEnRAAm5G6KUpAjHc0vjWa5mlFTWxX
 4V2/XMUZ/xwPDRlk38dkPj39cOivn03DCH6HiE/pmOuNKDuLFqRt/xcTvBJ0vBBq
 pv0dR1296bQnyH91eqa3EUxTdwY57f22n7qu9mjLMshROWk8fL39zZbUMyGuLx2A
 05Q6VIdjPVfgJyS8A7eBX8JhCQdiufgAPv2AIDsEI/vo/HLM4r1qo6M6xuDn7++k
 JaACr8Me3cUrT8B7ZKNQMlIgq+dx0Or4cQQx/cX3ECCMQY3h0Q6MNcpZKYbB0eRi
 UOVw3P8lmS0qUGjIdCSh+kxFuQdaG+9lzWiACLdf8wpcOpjMdi4f0FaEt9ZL/Tin
 LClNldJYFzu+6ZDYZX8+DE2Z7kCg3zARZeQApA7DTCa8qnVEiFd1GBV0zCS0QNyL
 NGPxdYfOsXDpw/caj0IbshFQHNVc0MQjGA7ZtUbKlDFjISC/Gnr+3PbFc/B040m0
 RzvedD1C7UOJ+sqJXVf6s6kkC60T9sk0lvC0eHrCp7ajblC27v2cpF62FMGZ4A/Q
 9ZpdHryNznMFCSr10C13WRNhfDnNWKTT4Q32hSNtgr5/k0E/3QjlT8g68X16/12S
 U65oiH162ZN/Tj3/gJoHKM7m87vrMNtRkN1ov2SycHd7XZitDIZb2GPZ6xJzzfBO
 cGgDVViDp/ulteCR6jI=
 =fyjZ
 -----END PGP SIGNATURE-----

Merge tag 'android-15.0.0_r5' into staging/lineage-22.0_merge-android-15.0.0_r5

Android 15.0.0 release 5

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZyvedQAKCRDorT+BmrEO
# eJOIAJ0Wc9J+EhQWGMZKJn3yTlEG7XhK1wCdEdhFLCN0QU6PTdzsKNnDMx85jJ0=
# =z08M
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed Nov  6 23:24:05 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 2337 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 Bill Yi
# Via Bill Yi
* tag 'android-15.0.0_r5':
  caimito: Update kernel directory to 24Q3-12386881

Change-Id: Ic2cbfaf5e30cd04653e062bff659e2f6f806b112
This commit is contained in:
Michael Bestas 2024-11-07 14:55:07 +02:00
commit 3ecabe5bf5
3 changed files with 9 additions and 9 deletions

View file

@ -20,7 +20,7 @@ endif
ifdef RELEASE_GOOGLE_CAIMAN_RADIOCFG_DIR
RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_CAIMAN_RADIOCFG_DIR)
endif
RELEASE_GOOGLE_BOOTLOADER_CAIMAN_DIR ?= 24D1# Keep this for pdk TODO: b/327119000
RELEASE_GOOGLE_BOOTLOADER_CAIMAN_DIR ?= 24Q3-12386881# Keep this for pdk TODO: b/327119000
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_CAIMAN_DIR)
$(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CAIMAN_DIR))
@ -28,8 +28,8 @@ ifdef RELEASE_KERNEL_CAIMAN_DIR
TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_CAIMAN_DIR)
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_CAIMAN_DIR)/kernel-headers
else
TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1
TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers
TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24Q3-12386881
TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24Q3-12386881/kernel-headers
endif
LOCAL_PATH := device/google/caimito

View file

@ -20,7 +20,7 @@ endif
ifdef RELEASE_GOOGLE_KOMODO_RADIOCFG_DIR
RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_KOMODO_RADIOCFG_DIR)
endif
RELEASE_GOOGLE_BOOTLOADER_KOMODO_DIR ?= 24D1# Keep this for pdk TODO: b/327119000
RELEASE_GOOGLE_BOOTLOADER_KOMODO_DIR ?= 24Q3-12386881# Keep this for pdk TODO: b/327119000
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_KOMODO_DIR)
$(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_KOMODO_DIR))
@ -28,8 +28,8 @@ ifdef RELEASE_KERNEL_KOMODO_DIR
TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_KOMODO_DIR)
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_KOMODO_DIR)/kernel-headers
else
TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1
TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers
TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24Q3-12386881
TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24Q3-12386881/kernel-headers
endif
LOCAL_PATH := device/google/caimito

View file

@ -20,7 +20,7 @@ endif
ifdef RELEASE_GOOGLE_TOKAY_RADIOCFG_DIR
RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR ?= $(RELEASE_GOOGLE_TOKAY_RADIOCFG_DIR)
endif
RELEASE_GOOGLE_BOOTLOADER_TOKAY_DIR ?= 24D1# Keep this for pdk TODO: b/327119000
RELEASE_GOOGLE_BOOTLOADER_TOKAY_DIR ?= 24Q3-12386881# Keep this for pdk TODO: b/327119000
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_TOKAY_DIR)
$(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_TOKAY_DIR))
@ -28,8 +28,8 @@ ifdef RELEASE_KERNEL_TOKAY_DIR
TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_TOKAY_DIR)
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_TOKAY_DIR)/kernel-headers
else
TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1
TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers
TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24Q3-12386881
TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24Q3-12386881/kernel-headers
endif
$(call inherit-product-if-exists, vendor/google_devices/caimito/prebuilts/device-vendor-tokay.mk)