From 2da3b12bc02b2cbae564a8cd75573f7d85ee461e Mon Sep 17 00:00:00 2001
From: Ramji Jiyani <ramjiyani@google.com>
Date: Wed, 12 Jan 2022 01:07:12 +0000
Subject: [PATCH] ANDROID: GKI: Enable system_dlkm build for gki

Update GKI build configs to build system_dlkm.img.

Add an empty system_dlkm modules list file at:
android/gki_system_dlkm_modules

Bug: 200082547
Bug: 214445388
Test: TH
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
Change-Id: Ia11b48d6033a39479d71c90159c74809a874893d
---
 android/gki_system_dlkm_modules | 0
 build.config.gki.aarch64        | 3 +++
 build.config.gki.x86_64         | 2 ++
 3 files changed, 5 insertions(+)
 create mode 100644 android/gki_system_dlkm_modules

diff --git a/android/gki_system_dlkm_modules b/android/gki_system_dlkm_modules
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/build.config.gki.aarch64 b/build.config.gki.aarch64
index a20dc711978c..5439e64e4c03 100644
--- a/build.config.gki.aarch64
+++ b/build.config.gki.aarch64
@@ -23,6 +23,9 @@ arch/arm64/boot/Image.lz4
 
 TRIM_NONLISTED_KMI=${TRIM_NONLISTED_KMI:-1}
 KMI_SYMBOL_LIST_STRICT_MODE=${KMI_SYMBOL_LIST_STRICT_MODE:-1}
+
+BUILD_SYSTEM_DLKM=1
+MODULES_LIST=${ROOT_DIR}/${KERNEL_DIR}/android/gki_system_dlkm_modules
 MODULES_ORDER=android/gki_aarch64_modules
 
 if [ -n "${GKI_DEFCONFIG_FRAGMENT}" ]; then
diff --git a/build.config.gki.x86_64 b/build.config.gki.x86_64
index 0e04fc692df2..b8f7773108e4 100644
--- a/build.config.gki.x86_64
+++ b/build.config.gki.x86_64
@@ -2,3 +2,5 @@
 . ${ROOT_DIR}/${KERNEL_DIR}/build.config.x86_64
 . ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki
 
+BUILD_SYSTEM_DLKM=1
+MODULES_LIST=${ROOT_DIR}/${KERNEL_DIR}/android/gki_system_dlkm_modules