commit 6100c90ef516eb9550fe6a33ba0b347a25d899b3
author Yifan Hong <elsk@google.com> Tue Nov 15 23:02:04 2022 -0800
committer Treehugger Robot <treehugger-gerrit@google.com> Tue Nov 22 23:42:33 2022 +0000
tree 353d3556b2882f0ad218495b77bc087e2e0f756e
parent ed4066359290f1324a0507f6885533462df57a5d

ANDROID: kleaf: convert rockpi4 to mixed build.

Build the GKI //common:kernel_aarch64, then
build rockpi4 modules on top of it.

As a side effect of this change, rockpi4 will no longer
be able to be built with build.sh because it won't produce
vmlinux, etc..

Test: TH
Test: bazel run //common:rockpi4_dist
Bug: 258841346
Change-Id: I88989a265d0a90daddc85dd45a8736f942350522
Signed-off-by: Yifan Hong <elsk@google.com>

BUILD.bazel

diff --git a/BUILD.bazel b/BUILD.bazel
index bdd9830..78502ea 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -244,20 +244,14 @@
     ],
 )
 
-# TODO(b/258259749): Convert rockpi4 to mixed build
 kernel_build(
     name = "rockpi4",
     outs = [
-        "Image",
-        "System.map",
-        "modules.builtin",
-        "modules.builtin.modinfo",
         "rk3399-rock-pi-4b.dtb",
-        "vmlinux",
-        "vmlinux.symvers",
     ],
+    base_kernel = "//common:kernel_aarch64",
     build_config = "build.config.rockpi4",
-    module_outs = COMMON_GKI_MODULES_LIST + [
+    module_outs = [
         # keep sorted
         "drivers/block/virtio_blk.ko",
         "drivers/char/hw_random/virtio-rng.ko",