From df36f07faa7d8d9b56532e77b75bcdaf811f731e Mon Sep 17 00:00:00 2001
From: Armando Montanez <amontanez@google.com>
Date: Thu, 9 Jan 2025 11:03:01 -0800
Subject: [PATCH] pw_toolchain: Cleanup transition flag
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Removes temporary flag required for updating rules_cc.

Fixes: b/384050813
Change-Id: Ib3d3b41ed10be253acd8bde24a6ae8b2976ca9d0
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/254433
Lint: Lint 🤖 <android-build-ayeaye@system.gserviceaccount.com>
Pigweed-Auto-Submit: Armando Montanez <amontanez@google.com>
Reviewed-by: Ted Pudlik <tpudlik@google.com>
Presubmit-Verified: CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com>
Docs-Not-Needed: Armando Montanez <amontanez@google.com>
Commit-Queue: Auto-Submit <auto-submit@pigweed-service-accounts.iam.gserviceaccount.com>
---
 pw_toolchain/host_clang/BUILD.bazel | 32 +----------------------------
 1 file changed, 1 insertion(+), 31 deletions(-)

diff --git a/pw_toolchain/host_clang/BUILD.bazel b/pw_toolchain/host_clang/BUILD.bazel
index 1457c9010..6757fe795 100644
--- a/pw_toolchain/host_clang/BUILD.bazel
+++ b/pw_toolchain/host_clang/BUILD.bazel
@@ -248,38 +248,8 @@ cc_args(
 )
 
 cc_feature(
-    name = "supports_pic_old",
-    overrides = "@rules_cc//cc/toolchains/features:supports_pic",
-    tags = ["manual"],
-    visibility = ["//visibility:private"],
-)
-
-# TODO: https://pwbug.dev/384050813 - This flag is a temporary transition flag
-# that will be removed shortly.
-bool_flag(
-    name = "new_rules_cc",
-    build_setting_default = True,
-)
-
-config_setting(
-    name = "rules_cc_post_0.0.10",
-    flag_values = {
-        ":new_rules_cc": "True",
-    },
-)
-
-cc_feature(
-    name = "supports_pic_actual",
-    feature_name = "supports_pic",
-    visibility = ["//visibility:private"],
-)
-
-alias(
     name = "supports_pic",
-    actual = select({
-        ":rules_cc_post_0.0.10": "supports_pic_actual",
-        "//conditions:default": "supports_pic_old",
-    }),
+    feature_name = "supports_pic",
 )
 
 # Symlink to clangd, for user convenience.