From b9977e007974dd85a1687ddaa82b7e6a2b350b2b Mon Sep 17 00:00:00 2001
From: Betty Zhou <bettyzhou@google.com>
Date: Wed, 1 May 2024 20:35:36 +0000
Subject: [PATCH] ANDROID: Build tests.zip in kernel_aarch64 & kernel_x86_64
 target.

Disable kfence kunit test due to build error.

Bug: 338255805
Signed-off-by: Betty Zhou <bettyzhou@google.com>

Change-Id: I676da370223b1cee09ae54ef22a975069db5c957
---
 BUILD.bazel                                        | 14 +++++++++++---
 .../testing/kunit/configs/android/kunit_defconfig  |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/BUILD.bazel b/BUILD.bazel
index b2918fa7d3e1..0405e6acd574 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -96,13 +96,19 @@ define_common_kernels(target_configs = {
         "module_implicit_outs": get_gki_modules_list("arm64"),
         "make_goals": _GKI_AARCH64_MAKE_GOALS,
         "ddk_headers_archive": ":kernel_aarch64_ddk_headers_archive",
-        "extra_dist": [":test_mappings_zip"],
+        "extra_dist": [
+            ":test_mappings_zip",
+            ":tests_zip_arm64",
+        ],
     },
     "kernel_x86_64": {
         "kmi_symbol_list_strict_mode": False,
         "module_implicit_outs": get_gki_modules_list("x86_64"),
         "make_goals": _GKI_X86_64_MAKE_GOALS,
-        "extra_dist": [":test_mappings_zip"],
+        "extra_dist": [
+            ":test_mappings_zip",
+            ":tests_zip_x86_64",
+        ],
     },
 })
 
@@ -729,7 +735,7 @@ _KUNIT_COMMON_MODULES = [
     "kernel/time/time_test.ko",
     "lib/kunit/kunit-example-test.ko",
     "lib/kunit/kunit-test.ko",
-    "mm/kfence/kfence_test.ko",
+    #"mm/kfence/kfence_test.ko",
     "net/core/dev_addr_lists_test.ko",
     "sound/soc/soc-topology-test.ko",
     "sound/soc/soc-utils-test.ko",
@@ -2412,6 +2418,7 @@ pkg_zip(
         ":kunit_tests_x86_64_pkg_files",
     ],
     out = "x86_64/tests.zip",
+    visibility = ["//visibility:public"],
 )
 
 pkg_zip(
@@ -2421,6 +2428,7 @@ pkg_zip(
         ":kunit_tests_arm64_pkg_files",
     ],
     out = "arm64/tests.zip",
+    visibility = ["//visibility:public"],
 )
 
 copy_to_dist_dir(
diff --git a/tools/testing/kunit/configs/android/kunit_defconfig b/tools/testing/kunit/configs/android/kunit_defconfig
index a3c43e3912e7..f3a96fcf5ade 100644
--- a/tools/testing/kunit/configs/android/kunit_defconfig
+++ b/tools/testing/kunit/configs/android/kunit_defconfig
@@ -20,7 +20,7 @@ CONFIG_RTC_LIB_KUNIT_TEST=m
 CONFIG_IIO_FORMAT_KUNIT_TEST=m
 CONFIG_EXT4_KUNIT_TESTS=m
 CONFIG_FAT_KUNIT_TEST=m
-CONFIG_KFENCE_KUNIT_TEST=m
+# CONFIG_KFENCE_KUNIT_TEST=m
 CONFIG_KUNIT_TEST=m
 CONFIG_KUNIT_EXAMPLE_TEST=m