From 942421fdf31e91e4b5d6e6d9a47896cb4e06e469 Mon Sep 17 00:00:00 2001
From: HONG Yifan <elsk@google.com>
Date: Thu, 7 Nov 2024 13:54:37 -0800
Subject: [PATCH] ANDROID: don't use platforms in config_setting.

Using platforms in config_setting is not officially supported
and has caused bugs. This change uses config_setting on constraints
provided by Kleaf.

Bug: 377799294
Link: https://bazel.build/docs/configurable-attributes#faq-select-platforms
Change-Id: I619de0447ad7d8f9c58a429aab15dea81dac7317
Signed-off-by: HONG Yifan <elsk@google.com>
---
 BUILD.bazel | 34 +++++-----------------------------
 1 file changed, 5 insertions(+), 29 deletions(-)

diff --git a/BUILD.bazel b/BUILD.bazel
index d3d44cd0caa3..4b816b116ed0 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -1591,34 +1591,10 @@ _KSELFTEST_COPTS = [
         "tools/testing/selftests/android/include/bionic-compat.h",
     ),
 ] + select({
-    ":arm": ["-mcpu=cortex-a8"],
+    "//build/kernel/kleaf/platforms/config_settings:android_arm": ["-mcpu=cortex-a8"],
     "//conditions:default": [],
 })
 
-config_setting(
-    name = "x86_64",
-    values = {"platforms": str(package_relative_label("//build/kernel/kleaf/impl:android_x86_64"))},
-    visibility = ["//visibility:private"],
-)
-
-config_setting(
-    name = "i386",
-    values = {"platforms": str(package_relative_label("//build/kernel/kleaf/impl:android_i386"))},
-    visibility = ["//visibility:private"],
-)
-
-config_setting(
-    name = "arm64",
-    values = {"platforms": str(package_relative_label("//build/kernel/kleaf/impl:android_arm64"))},
-    visibility = ["//visibility:private"],
-)
-
-config_setting(
-    name = "arm",
-    values = {"platforms": str(package_relative_label("//build/kernel/kleaf/impl:android_arm"))},
-    visibility = ["//visibility:private"],
-)
-
 cc_library(
     name = "kselftest_headers_lib",
     hdrs = glob(["tools/testing/selftests/*.h"]) + [
@@ -1644,9 +1620,9 @@ cc_binary_with_abi(
 cc_binary_with_abi(
     name = "kselftest_breakpoints_breakpoint_test",
     srcs = select({
-        ":x86_64": ["tools/testing/selftests/breakpoints/breakpoint_test.c"],
-        ":i386": ["tools/testing/selftests/breakpoints/breakpoint_test.c"],
-        ":arm64": ["tools/testing/selftests/breakpoints/breakpoint_test_arm64.c"],
+        "//build/kernel/kleaf/platforms/config_settings:android_x86_64": ["tools/testing/selftests/breakpoints/breakpoint_test.c"],
+        "//build/kernel/kleaf/platforms/config_settings:android_i386": ["tools/testing/selftests/breakpoints/breakpoint_test.c"],
+        "//build/kernel/kleaf/platforms/config_settings:android_arm64": ["tools/testing/selftests/breakpoints/breakpoint_test_arm64.c"],
         "//conditions:default": [],
     }),
     copts = _KSELFTEST_COPTS,
@@ -2160,7 +2136,7 @@ cc_binary_with_abi(
     name = "kselftest_size_test_get_size",
     srcs = ["tools/testing/selftests/size/get_size.c"],
     copts = _KSELFTEST_COPTS + select({
-        ":x86_64": ["-mstackrealign"],
+        "//build/kernel/kleaf/platforms/config_settings:android_x86_64": ["-mstackrealign"],
         "//conditions:default": [],
     }),
     includes = [