From 0ddd61a73fb87c9e133a8d274847c7d2066ab68f Mon Sep 17 00:00:00 2001
From: Sid Nayyar <sidnayyar@google.com>
Date: Fri, 19 Jul 2024 14:26:16 +0000
Subject: [PATCH] Add kernel lifetimes and approved OGKI builds configs to GSI

These kernel configs are required for end-of-life enforcement and OGKI
compliance verification VTS tests.

Bug: 338636324
Bug: 342094847
Test: manually built and flashed on device, device had config files
Change-Id: Ia1f94ba19bab1f2e3b129827ad5634023290dbc5
---
 target/product/base_system.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 795d3f893c..9728cc0bee 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -444,6 +444,11 @@ PRODUCT_VENDOR_PROPERTIES += ro.zygote?=zygote32
 PRODUCT_SYSTEM_PROPERTIES += debug.atrace.tags.enableflags=0
 PRODUCT_SYSTEM_PROPERTIES += persist.traced.enable=1
 
+# Include kernel configs.
+PRODUCT_PACKAGES += \
+    approved-ogki-builds.xml \
+    kernel-lifetimes.xml
+
 # Packages included only for eng or userdebug builds, previously debug tagged
 PRODUCT_PACKAGES_DEBUG := \
     adb_keys \