From ad0409f9172e5013ecf3aa8ea0f98f0f40f57e0a Mon Sep 17 00:00:00 2001
From: Chris Fries <cfries@google.com>
Date: Tue, 10 Aug 2021 15:09:10 -0500
Subject: [PATCH] Revert "device.mk: Freeze vendor security patch 2021-09-0x"

Undo this temp hack before launch.

Bug: 187105270
Change-Id: Ieb210d1c713aa4434748af8d6848574f5da7f798
---
 device.mk | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/device.mk b/device.mk
index 6fdad10c..982ecb66 100644
--- a/device.mk
+++ b/device.mk
@@ -26,13 +26,8 @@ AB_OTA_POSTINSTALL_CONFIG += \
 	FILESYSTEM_TYPE_system=ext4 \
 POSTINSTALL_OPTIONAL_system=true
 
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-# STOPSHIP (b/187105270) hack: temp freeze to a lower security patch
-VENDOR_SECURITY_PATCH = 2021-09-07
-else
 # Set Vendor SPL to match platform
 VENDOR_SECURITY_PATCH = $(PLATFORM_SECURITY_PATCH)
-endif
 
 # Set boot SPL
 BOOT_SECURITY_PATCH = $(PLATFORM_SECURITY_PATCH)