From 6bf961140e13b2dc0254962413d14561205909b5 Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Thu, 5 Dec 2024 14:43:16 -0800 Subject: [PATCH] Add missing rules_apple allowlist alias If this is used from a WORKSPACE, or used in bzlmod with the repo name overridden to the old name, rules_apple isn't correct for this allowlist. --- .../google/devtools/build/lib/packages/BuiltinRestriction.java | 1 + .../devtools/build/lib/starlarkbuildapi/objc/AppleBootstrap.java | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/java/com/google/devtools/build/lib/packages/BuiltinRestriction.java b/src/main/java/com/google/devtools/build/lib/packages/BuiltinRestriction.java index 4a150bd5f9839d..b4ff4ac8cb966f 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/BuiltinRestriction.java +++ b/src/main/java/com/google/devtools/build/lib/packages/BuiltinRestriction.java @@ -52,6 +52,7 @@ public final class BuiltinRestriction { // Apple rules BuiltinRestriction.allowlistEntry("", "third_party/bazel_rules/rules_apple"), BuiltinRestriction.allowlistEntry("rules_apple", ""), + BuiltinRestriction.allowlistEntry("build_bazel_rules_apple", ""), // Cc rules BuiltinRestriction.allowlistEntry("", "third_party/bazel_rules/rules_cc"), diff --git a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/objc/AppleBootstrap.java b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/objc/AppleBootstrap.java index 58d8a6e3f49a3e..344f692a544482 100644 --- a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/objc/AppleBootstrap.java +++ b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/objc/AppleBootstrap.java @@ -31,6 +31,7 @@ public class AppleBootstrap implements Bootstrap { PackageIdentifier.createUnchecked("apple_support", ""), PackageIdentifier.createUnchecked("bazel_tools", ""), PackageIdentifier.createUnchecked("build_bazel_rules_swift", ""), // alias for rules_swift + PackageIdentifier.createUnchecked("build_bazel_rules_apple", ""), // alias for rules_apple PackageIdentifier.createUnchecked("io_bazel_rules_go", ""), // alias for rules_go PackageIdentifier.createUnchecked("local_config_cc", ""), PackageIdentifier.createUnchecked("rules_apple", ""),