Skip to content

Security Patches :D #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 20 commits into
base: eleven
Choose a base branch
from
Open

Security Patches :D #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
091679d
Bump Security String to 2022-07-05
haggertk Jul 11, 2022
49e17af
Bump Security String to 2022-08-05
haggertk Aug 4, 2022
9fbcab9
Bump Security String to 2022-09-05
haggertk Sep 10, 2022
85b0d23
Bump Security String to 2022-10-05
haggertk Oct 6, 2022
5608483
Bump Security String to 2022-11-05
haggertk Nov 10, 2022
0df57bb
Bump Security String to 2022-12-05
haggertk Dec 8, 2022
3b89637
Bump Security String to 2023-01-05
haggertk Jan 7, 2023
bc27082
Bump Security String to 2023-02-05
haggertk Feb 11, 2023
6a296ec
Bump Security String to 2023-03-05
haggertk Mar 17, 2023
877a57f
Bump Security String to 2023-04-05
haggertk Apr 15, 2023
cb17538
Bump Security String to 2023-05-05
haggertk May 6, 2023
60314cc
Add support for separate kernels for boot and recovery [2/2]
marcost2 Jul 6, 2021
901fe58
Add support for separate kernels for boot and recovery [2/2]
marcost2 Jul 6, 2021
1855e14
Bump Security String to 2023-06-05
haggertk Jun 9, 2023
034493c
Bump Security String to 2023-07-05
haggertk Jul 11, 2023
1bf6766
Bump Security String to 2023-08-05
haggertk Aug 12, 2023
ce23fa9
Bump Security String to 2023-09-05
haggertk Sep 10, 2023
73a363f
Bump Security String to 2023-10-06
haggertk Oct 7, 2023
300a1fe
Bump Security String to 2023-11-05
haggertk Nov 12, 2023
0502b04
Bump Security String to 2023-12-05
haggertk Dec 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 20 additions & 6 deletions core/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1104,6 +1104,17 @@ else
INSTALLED_KERNEL_TARGET :=
endif

ifdef INSTALLED_KERNEL_TARGET
ifneq (,$(filter true,$(BOARD_USES_RECOVERY_AS_BOOT)))
INSTALLED_RECOVERY_KERNEL_TARGET := $(INSTALLED_KERNEL_TARGET)
else ifneq (true,$(BOARD_EXCLUDE_KERNEL_FROM_RECOVERY_IMAGE))
ifneq "$(or $(TARGET_KERNEL_RECOVERY_CONFIG), $(TARGET_PREBUILT_RECOVERY_KERNEL))" ""
INSTALLED_RECOVERY_KERNEL_TARGET := $(PRODUCT_OUT)/recovery_kernel
else
INSTALLED_RECOVERY_KERNEL_TARGET := $(firstword $(INSTALLED_KERNEL_TARGET))
endif
endif
endif
# -----------------------------------------------------------------
# the root dir
INTERNAL_ROOT_FILES := $(filter $(TARGET_ROOT_OUT)/%, \
Expand Down Expand Up @@ -1942,7 +1953,9 @@ recovery_sepolicy := \
# SELinux files
IGNORE_RECOVERY_SEPOLICY := $(patsubst $(TARGET_RECOVERY_OUT)/%,--exclude=/%,$(recovery_sepolicy))

recovery_kernel := $(INSTALLED_KERNEL_TARGET) # same as a non-recovery system
# if building multiple boot images from multiple kernels, use the first kernel listed
# for the recovery image
recovery_kernel := $(INSTALLED_RECOVERY_KERNEL_TARGET)
recovery_ramdisk := $(PRODUCT_OUT)/ramdisk-recovery.img
recovery_uncompressed_ramdisk := $(PRODUCT_OUT)/ramdisk-recovery.cpio
recovery_resources_common := $(call include-path-for, recovery)/res
Expand Down Expand Up @@ -4622,6 +4635,8 @@ $(BUILT_TARGET_FILES_PACKAGE): \
$(INSTALLED_CUSTOMIMAGES_TARGET) \
$(INTERNAL_SYSTEMOTHERIMAGE_FILES) \
$(INSTALLED_ANDROID_INFO_TXT_TARGET) \
$(INSTALLED_RECOVERY_KERNEL) \
$(INSTALLED_RECOVERY_KERNEL_TARGET) \
$(INSTALLED_KERNEL_TARGET) \
$(INSTALLED_DTBIMAGE_TARGET) \
$(INSTALLED_2NDBOOTLOADER_TARGET) \
Expand Down Expand Up @@ -4660,12 +4675,11 @@ ifneq (,$(INSTALLED_RECOVERYIMAGE_TARGET)$(filter true,$(BOARD_USES_RECOVERY_AS_
@# OTA install helpers
$(hide) $(call package_files-copy-root, \
$(PRODUCT_OUT)/install,$(zip_root)/INSTALL)
ifdef INSTALLED_KERNEL_TARGET
cp $(INSTALLED_KERNEL_TARGET) $(zip_root)/$(PRIVATE_RECOVERY_OUT)/
ifdef INSTALLED_RECOVERY_KERNEL_TARGET
# The python script that wraps it all up wants it to be named kernel, so do that
cp $(INSTALLED_RECOVERY_KERNEL_TARGET) $(zip_root)/$(PRIVATE_RECOVERY_OUT)/kernel
endif
ifeq (truetrue,$(strip $(BUILDING_VENDOR_BOOT_IMAGE))$(strip $(AB_OTA_UPDATER)))
echo "$(GENERIC_KERNEL_CMDLINE)" > $(zip_root)/$(PRIVATE_RECOVERY_OUT)/cmdline
else # not (BUILDING_VENDOR_BOOT_IMAGE and AB_OTA_UPDATER)
ifneq (truetrue,$(strip $(BUILDING_VENDOR_BOOT_IMAGE))$(strip $(BOARD_USES_RECOVERY_AS_BOOT)))
ifdef INSTALLED_2NDBOOTLOADER_TARGET
cp $(INSTALLED_2NDBOOTLOADER_TARGET) $(zip_root)/$(PRIVATE_RECOVERY_OUT)/second
endif
Expand Down
2 changes: 1 addition & 1 deletion core/version_defaults.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ ifndef PLATFORM_SECURITY_PATCH
# It must be of the form "YYYY-MM-DD" on production devices.
# It must match one of the Android Security Patch Level strings of the Public Security Bulletins.
# If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.
PLATFORM_SECURITY_PATCH := 2022-06-05
PLATFORM_SECURITY_PATCH := 2023-12-05
endif
.KATI_READONLY := PLATFORM_SECURITY_PATCH

Expand Down