From f112f045bc987d8847d5fb07d8c4e4fd5a06361e Mon Sep 17 00:00:00 2001 From: Jonathan Klee Date: Fri, 29 Apr 2022 17:48:10 +0200 Subject: [PATCH] Force use of eos specific security patch There seems to be race conditions between ih8sn security patch value override and Build.SECURITY_PATCH initialization. --- core/Makefile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/core/Makefile b/core/Makefile index 6cbc275a83..ca5bb6e268 100644 --- a/core/Makefile +++ b/core/Makefile @@ -994,10 +994,7 @@ 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 +PLATFORM_SECURITY_PATCH_EOS := $(PLATFORM_SECURITY_PATCH) INTERNAL_MKBOOTIMG_VERSION_ARGS := \ --os_version $(PLATFORM_VERSION) \ -- GitLab