commit 023b893955795843971c8729b27328ffb648b012
author Yifan Hong <elsk@google.com> Tue Nov 22 23:43:51 2022 +0000
committer Yifan Hong <elsk@google.com> Tue Nov 22 23:44:09 2022 +0000
tree edad32e1458e049ef1b03f86a52cdc7c8fd8a654
parent 6100c90ef516eb9550fe6a33ba0b347a25d899b3

Revert "ANDROID: kleaf: convert rockpi4 to mixed build."

This reverts commit 6100c90ef516eb9550fe6a33ba0b347a25d899b3.

Reason for revert: rockpi4 has DEVTMPFS enabled and GKI doesn't

Bug: 258841346
Change-Id: Icefb1bb4cf39004234513d307e385b04cb76e51d

BUILD.bazel

diff --git a/BUILD.bazel b/BUILD.bazel
index 78502ea..bdd9830 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -244,14 +244,20 @@
     ],
 )
 
+# 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 = [
+    module_outs = COMMON_GKI_MODULES_LIST + [
         # keep sorted
         "drivers/block/virtio_blk.ko",
         "drivers/char/hw_random/virtio-rng.ko",