Merge remote-tracking branch 'upstream/lineage-21' into HEAD
diff --git a/BoardConfigLineage.mk b/BoardConfigLineage.mk
index 8717559..fe0870c 100644
--- a/BoardConfigLineage.mk
+++ b/BoardConfigLineage.mk
@@ -4,8 +4,6 @@
# SPDX-License-Identifier: Apache-2.0
#
-BUILD_BROKEN_ELF_PREBUILT_PRODUCT_COPY_FILES := true
-
# Lineage Health
TARGET_HEALTH_CHARGING_CONTROL_SUPPORTS_DEADLINE := true
TARGET_HEALTH_CHARGING_CONTROL_SUPPORTS_TOGGLE := false
diff --git a/device.mk b/device.mk
index 1e0003d..20c9ffe 100644
--- a/device.mk
+++ b/device.mk
@@ -54,10 +54,10 @@
POSTINSTALL_OPTIONAL_system=true
# Set Vendor SPL to match platform
-VENDOR_SECURITY_PATCH = $(PLATFORM_SECURITY_PATCH)
+VENDOR_SECURITY_PATCH := 2024-09-05
# Set boot SPL
-BOOT_SECURITY_PATCH = $(PLATFORM_SECURITY_PATCH)
+BOOT_SECURITY_PATCH := 2024-09-05
PRODUCT_SOONG_NAMESPACES += \
hardware/google/av \