Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f75540e8 authored by Jonathan Klee's avatar Jonathan Klee
Browse files

Merge branch 'security_patch' into 'v1-q' 

Allow security_patch to be overriden for SafetyNet purpose

See merge request !24
parents d723f76f 79b23411

core/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -442,6 +442,7 @@ endif 
	        AB_OTA_UPDATER="$(AB_OTA_UPDATER)" \

	        PLATFORM_VERSION="$(PLATFORM_VERSION)" \

	        PLATFORM_SECURITY_PATCH="$(PLATFORM_SECURITY_PATCH)" \

	        PLATFORM_SECURITY_PATCH_EOS="$(PLATFORM_SECURITY_PATCH_EOS)" \

	        PLATFORM_BASE_OS="$(PLATFORM_BASE_OS)" \

	        PLATFORM_SDK_VERSION="$(PLATFORM_SDK_VERSION)" \

	        PLATFORM_PREVIEW_SDK_VERSION="$(PLATFORM_PREVIEW_SDK_VERSION)" \
@@ -993,6 +994,11 @@ ifdef INTERNAL_KERNEL_CMDLINE 
INTERNAL_BOOTIMAGE_ARGS += --cmdline "$(INTERNAL_KERNEL_CMDLINE)"

endif



ifneq (,$(PLATFORM_SECURITY_PATCH_OVERRIDE)

  PLATFORM_SECURITY_PATCH_EOS := $(PLATFORM_SECURITY_PATCH)

  PLATFORM_SECURITY_PATCH := $(PLATFORM_SECURITY_PATCH_OVERRIDE)

endif



INTERNAL_MKBOOTIMG_VERSION_ARGS := \

    --os_version $(PLATFORM_VERSION) \

    --os_patch_level $(PLATFORM_SECURITY_PATCH)

core/version_defaults.mk

+0 −1
Original line number Diff line number Diff line
@@ -252,7 +252,6 @@ ifndef PLATFORM_SECURITY_PATCH 
    #  If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.

      PLATFORM_SECURITY_PATCH := 2022-01-05

endif

.KATI_READONLY := PLATFORM_SECURITY_PATCH



ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP

  # Used to indicate the matching timestamp for the security patch string in PLATFORM_SECURITY_PATCH.

tools/buildinfo.sh

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ echo "ro.build.version.codename=$PLATFORM_VERSION_CODENAME" 
echo "ro.build.version.all_codenames=$PLATFORM_VERSION_ALL_CODENAMES"

echo "ro.build.version.release=$PLATFORM_VERSION"

echo "ro.build.version.security_patch=$PLATFORM_SECURITY_PATCH"

echo "ro.eos.version.security_patch=$PLATFORM_SECURITY_PATCH_EOS"

echo "ro.build.version.base_os=$PLATFORM_BASE_OS"

echo "ro.build.version.min_supported_target_sdk=$PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION"

echo "ro.build.date=`$DATE`"