From cd68e142bc6f25d8fe592f31fc37801b03bdaff7 Mon Sep 17 00:00:00 2001
From: Ulises Mendez Martinez <umendez@google.com>
Date: Tue, 23 Aug 2022 23:22:40 +0000
Subject: [PATCH] Revert "ANDROID: Convert db845c to a mixed build."

Revert "ANDROID: Convert db845c to a mixed build."

Revert submission 2188970-db845c_mixed_build

Reason for revert: It breaks android-mainline
Reverted Changes:
I6cfb1ef19:ANDROID: Convert db845c to a mixed build.
I6680cb8ef:kleaf: Convert db845c to a mixed build.
I6cfb1ef19:ANDROID: Convert db845c to a mixed build.

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

diff --git a/BUILD.bazel b/BUILD.bazel
index 70aeb259ee01..69c93584bc3c 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -17,6 +17,7 @@ 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
@@ -47,7 +48,7 @@ define_common_kernels(target_configs = {
 # Sync with build.config.db845c
 define_db845c(
     name = "db845c",
-    outs = [
+    outs = aarch64_gz_outs + [
         "arch/arm64/boot/dts/qcom/qrb5165-rb5.dtb",
         "arch/arm64/boot/dts/qcom/sdm845-db845c.dtb",
     ],
@@ -57,6 +58,8 @@ 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",
@@ -186,6 +189,8 @@ 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 0144df81289e..ef2301b5ed27 100644
--- a/arch/arm64/configs/db845c_gki.fragment
+++ b/arch/arm64/configs/db845c_gki.fragment
@@ -1,4 +1,3 @@
-# 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 3da01aca6cd5..6bbb310805db 100644
--- a/build.config.db845c
+++ b/build.config.db845c
@@ -7,13 +7,14 @@ 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="
-modules
+MAKE_GOALS="${MAKE_GOALS}
 qcom/sdm845-db845c.dtb
 qcom/qrb5165-rb5.dtb
+Image.gz
 "
 
-FILES="
+FILES="${FILES}
+arch/arm64/boot/Image.gz
 arch/arm64/boot/dts/qcom/sdm845-db845c.dtb
 arch/arm64/boot/dts/qcom/qrb5165-rb5.dtb
 "