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
diff --git a/BUILD.bazel b/BUILD.bazel
index f8b42a7..ceff2c8 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -17,7 +17,6 @@
],
)
-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 @@
# 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 @@
"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 @@
"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",