From b856e6cf38e474cf6f4c45fad89ede14ba98567e Mon Sep 17 00:00:00 2001
From: Ulises Mendez Martinez <umendez@google.com>
Date: Fri, 2 Sep 2022 19:21:44 +0000
Subject: [PATCH] ANDROID: Convert db845c to a mixed build.

* This means using GKI[0] artifacts as base for the kernel.

[0] https://source.android.com/docs/core/architecture/kernel/generic-kernel-image#fragmentation-fix-gki

* It was initially submitted as part of https://r.android.com/q/topic:db845c_mixed_build but then reverted in https://r.android.com/q/topic:revert-2188970-db845c_mixed_build-YESQWWKQCV

* https://android-review.googlesource.com/c/kernel/common/+/2203435 fixes the previous reason for reverting, making it safe to submit it again.

Bug: 233404531
Signed-off-by: Ulises Mendez Martinez <umendez@google.com>
Change-Id: I18813d34b4b7f9de54c334e47c6478ff235cf37f
---
 BUILD.bazel                            | 7 +------
 arch/arm64/configs/db845c_gki.fragment | 1 +
 build.config.db845c                    | 7 +++----
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/BUILD.bazel b/BUILD.bazel
index f8b42a7a817e..ceff2c8f0e79 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -17,7 +17,6 @@ package(
     ],
 )
 
-load("//build/kernel/kleaf:constants.bzl", "aarch64_gz_outs")
 load("//build/kernel/kleaf:common_kernels.bzl", "define_common_kernels", "define_db845c")
 
 # This uses android/abi_gki_aarch64* in kmi_configs. If the list of
@@ -48,7 +47,7 @@ define_common_kernels(target_configs = {
 # Sync with build.config.db845c
 define_db845c(
     name = "db845c",
-    outs = aarch64_gz_outs + [
+    outs = [
         "arch/arm64/boot/dts/qcom/qrb5165-rb5.dtb",
         "arch/arm64/boot/dts/qcom/sdm845-db845c.dtb",
     ],
@@ -58,8 +57,6 @@ define_db845c(
         "drivers/base/regmap/regmap-sdw.ko",
         "drivers/base/regmap/regmap-slimbus.ko",
         "drivers/base/regmap/regmap-spmi.ko",
-        # TODO(b/233404531): Remove zram.ko when db845c is a mixed build
-        "drivers/block/zram/zram.ko",
         "drivers/bus/mhi/core/mhi.ko",
         "drivers/clk/qcom/clk-qcom.ko",
         "drivers/clk/qcom/clk-rpmh.ko",
@@ -189,8 +186,6 @@ define_db845c(
         "drivers/usb/typec/qcom-pmic-typec.ko",
         "drivers/watchdog/pm8916_wdt.ko",
         "drivers/watchdog/qcom-wdt.ko",
-        # TODO(b/233404531): Remove zsmalloc.ko when db845c is a mixed build
-        "mm/zsmalloc.ko",
         "net/mac80211/mac80211.ko",
         "net/qrtr/ns.ko",
         "net/qrtr/qrtr.ko",
diff --git a/arch/arm64/configs/db845c_gki.fragment b/arch/arm64/configs/db845c_gki.fragment
index ef2301b5ed27..0144df81289e 100644
--- a/arch/arm64/configs/db845c_gki.fragment
+++ b/arch/arm64/configs/db845c_gki.fragment
@@ -1,3 +1,4 @@
+# CONFIG_MODULE_SIG_ALL is not set
 CONFIG_CFG80211=m
 CONFIG_NL80211_TESTMODE=y
 # CONFIG_CFG80211_DEFAULT_PS is not set
diff --git a/build.config.db845c b/build.config.db845c
index 6bbb310805db..3da01aca6cd5 100644
--- a/build.config.db845c
+++ b/build.config.db845c
@@ -7,14 +7,13 @@ FRAGMENT_CONFIG=${KERNEL_DIR}/arch/arm64/configs/db845c_gki.fragment
 PRE_DEFCONFIG_CMDS="KCONFIG_CONFIG=${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/gki_defconfig ${ROOT_DIR}/${FRAGMENT_CONFIG}"
 POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG}"
 
-MAKE_GOALS="${MAKE_GOALS}
+MAKE_GOALS="
+modules
 qcom/sdm845-db845c.dtb
 qcom/qrb5165-rb5.dtb
-Image.gz
 "
 
-FILES="${FILES}
-arch/arm64/boot/Image.gz
+FILES="
 arch/arm64/boot/dts/qcom/sdm845-db845c.dtb
 arch/arm64/boot/dts/qcom/qrb5165-rb5.dtb
 "