From ce9e4aec705a579ff8e1a8c8e8a37a792d42334c Mon Sep 17 00:00:00 2001 From: Jonathan Klee Date: Mon, 2 May 2022 08:32:12 +0200 Subject: [PATCH] Force use of eos specific 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 7fbfe16c70..25bca8b3dd 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1251,10 +1251,7 @@ ifdef GENERIC_KERNEL_CMDLINE endif 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_LAST_STABLE) \ -- GitLab