From 463dfbb7e80a03e387e0ff28db321980006957b6 Mon Sep 17 00:00:00 2001
From: John Moon <quic_johmoo@quicinc.com>
Date: Thu, 27 Jul 2023 09:25:18 -0700
Subject: [PATCH] ANDROID: build: Remove test_mapping definitions

Kleaf test_mapping rules are no longer used upstream and were being
skipped in our builds anyway.

Remove the test_mapping rules.

Change-Id: If8689f4572b1d1dce2c8ba03075444fa3af7d86b
Signed-off-by: John Moon <quic_johmoo@quicinc.com>
---
 build_with_bazel.py       |  2 +-
 msm_kernel_extensions.bzl |  2 +-
 msm_kernel_la.bzl         | 11 -----------
 msm_kernel_le.bzl         | 11 -----------
 msm_kernel_lxc.bzl        | 11 -----------
 msm_kernel_vm.bzl         | 11 -----------
 6 files changed, 2 insertions(+), 46 deletions(-)

diff --git a/build_with_bazel.py b/build_with_bazel.py
index 7942fbf11dde..701e4f501e8e 100755
--- a/build_with_bazel.py
+++ b/build_with_bazel.py
@@ -12,7 +12,7 @@ import sys
 import subprocess
 
 HOST_TARGETS = ["dtc"]
-DEFAULT_SKIP_LIST = ["abi", "test_mapping"]
+DEFAULT_SKIP_LIST = ["abi"]
 MSM_EXTENSIONS = "build/msm_kernel_extensions.bzl"
 ABL_EXTENSIONS = "build/abl_extensions.bzl"
 DEFAULT_MSM_EXTENSIONS_SRC = "../msm-kernel/msm_kernel_extensions.bzl"
diff --git a/msm_kernel_extensions.bzl b/msm_kernel_extensions.bzl
index 9be584c766ae..235b1bc86f9c 100644
--- a/msm_kernel_extensions.bzl
+++ b/msm_kernel_extensions.bzl
@@ -2,7 +2,7 @@ load("@bazel_skylib//rules:common_settings.bzl", "bool_flag")
 load("//msm-kernel/arch/arm64/boot/dts/vendor:qcom/platform_map.bzl", _get_dtb_list = "get_dtb_list", _get_dtbo_list = "get_dtbo_list")
 
 def define_top_level_rules():
-    for skippable in ["abl", "dtc", "test_mapping", "abi"]:
+    for skippable in ["abl", "dtc", "abi"]:
         bool_flag(name = "skip_{}".format(skippable), build_setting_default = False)
 
         native.config_setting(
diff --git a/msm_kernel_la.bzl b/msm_kernel_la.bzl
index 10d19695c098..9c30839abd9a 100644
--- a/msm_kernel_la.bzl
+++ b/msm_kernel_la.bzl
@@ -1,5 +1,4 @@
 load("//build/bazel_common_rules/dist:dist.bzl", "copy_to_dist_dir")
-load("//build/bazel_common_rules/test_mappings:test_mappings.bzl", "test_mappings_dist")
 load(
     "//build/kernel/kleaf:kernel.bzl",
     "kernel_abi",
@@ -396,16 +395,6 @@ def _define_kernel_dist(
             log = "info",
         )
 
-    native.alias(
-        name = "{}_test_mapping".format(target),
-        actual = ":{}_dist".format(target),
-    )
-
-    test_mappings_dist(
-        name = "{}_test_mapping_dist".format(target),
-        dist_dir = dist_dir,
-    )
-
 def _define_uapi_library(target):
     """Define a cc_library for userspace programs to use
 
diff --git a/msm_kernel_le.bzl b/msm_kernel_le.bzl
index 93f2eb283845..890c9c2fba4c 100644
--- a/msm_kernel_le.bzl
+++ b/msm_kernel_le.bzl
@@ -1,5 +1,4 @@
 load("//build/bazel_common_rules/dist:dist.bzl", "copy_to_dist_dir")
-load("//build/bazel_common_rules/test_mappings:test_mappings.bzl", "test_mappings_dist")
 load("//build/kernel/kleaf:constants.bzl", "aarch64_outs")
 load(
     "//build/kernel/kleaf:kernel.bzl",
@@ -200,16 +199,6 @@ def _define_kernel_dist(target, msm_target, variant):
         log = "info",
     )
 
-    native.alias(
-        name = "{}_test_mapping".format(target),
-        actual = ":{}_dist".format(target),
-    )
-
-    test_mappings_dist(
-        name = "{}_test_mapping_dist".format(target),
-        dist_dir = dist_dir,
-    )
-
 def define_msm_le(
         msm_target,
         variant,
diff --git a/msm_kernel_lxc.bzl b/msm_kernel_lxc.bzl
index f78be54d231c..90b76cd16926 100644
--- a/msm_kernel_lxc.bzl
+++ b/msm_kernel_lxc.bzl
@@ -1,5 +1,4 @@
 load("//build/bazel_common_rules/dist:dist.bzl", "copy_to_dist_dir")
-load("//build/bazel_common_rules/test_mappings:test_mappings.bzl", "test_mappings_dist")
 load("//build/kernel/kleaf:constants.bzl", "aarch64_outs")
 load(
     "//build/kernel/kleaf:kernel.bzl",
@@ -196,16 +195,6 @@ def _define_kernel_dist(target, msm_target, variant):
         log = "info",
     )
 
-    native.alias(
-        name = "{}_test_mapping".format(target),
-        actual = ":{}_dist".format(target),
-    )
-
-    test_mappings_dist(
-        name = "{}_test_mapping_dist".format(target),
-        dist_dir = dist_dir,
-    )
-
 def _define_uapi_library(target):
     """Define a cc_library for userspace programs to use
 
diff --git a/msm_kernel_vm.bzl b/msm_kernel_vm.bzl
index 8147c2c6bf28..538dfbf3ca35 100644
--- a/msm_kernel_vm.bzl
+++ b/msm_kernel_vm.bzl
@@ -1,5 +1,4 @@
 load("//build/bazel_common_rules/dist:dist.bzl", "copy_to_dist_dir")
-load("//build/bazel_common_rules/test_mappings:test_mappings.bzl", "test_mappings_dist")
 load("//build/kernel/kleaf:constants.bzl", "aarch64_outs")
 load(
     "//build/kernel/kleaf:kernel.bzl",
@@ -237,16 +236,6 @@ def _define_kernel_dist(target, msm_target, variant):
         log = "info",
     )
 
-    native.alias(
-        name = "{}_test_mapping".format(target),
-        actual = ":{}_dist".format(target),
-    )
-
-    test_mappings_dist(
-        name = "{}_test_mapping_dist".format(target),
-        dist_dir = dist_dir,
-    )
-
 def _define_uapi_library(target):
     """Define a cc_library for userspace programs to use