Expose internal functions needed by multi_arch_binary_support.bzl and linking_support.bzl (both from builtins_bzl/common/objc/) via apple_common.
This is inpreparation for moving the content of both bzl files to the repo in unknown commit.
PiperOrigin-RevId: 686100272
Change-Id: Iadbe8da6a4335e30daca889cd19afcb627df2b5c
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 f7d3d54..4a150bd 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
@@ -49,6 +49,10 @@
BuiltinRestriction.allowlistEntry("rules_android", ""),
BuiltinRestriction.allowlistEntry("build_bazel_rules_android", ""),
+ // Apple rules
+ BuiltinRestriction.allowlistEntry("", "third_party/bazel_rules/rules_apple"),
+ BuiltinRestriction.allowlistEntry("rules_apple", ""),
+
// Cc rules
BuiltinRestriction.allowlistEntry("", "third_party/bazel_rules/rules_cc"),
BuiltinRestriction.allowlistEntry("rules_cc", ""),
diff --git a/src/main/starlark/builtins_bzl/common/objc/apple_common.bzl b/src/main/starlark/builtins_bzl/common/objc/apple_common.bzl
index ab50124..a72965e 100644
--- a/src/main/starlark/builtins_bzl/common/objc/apple_common.bzl
+++ b/src/main/starlark/builtins_bzl/common/objc/apple_common.bzl
@@ -15,13 +15,15 @@
"""Legacy apple_common module"""
load(":common/objc/apple_env.bzl", "apple_host_system_env", "target_apple_env")
-load(":common/objc/apple_platform.bzl", "PLATFORM", "PLATFORM_TYPE")
+load(":common/objc/apple_platform.bzl", "PLATFORM", "PLATFORM_TYPE", "apple_platform")
load(":common/objc/apple_toolchain.bzl", "apple_toolchain")
+load(":common/objc/compilation_support.bzl", "compilation_support")
load(":common/objc/linking_support.bzl", "AppleDebugOutputsInfo", "AppleDynamicFrameworkInfo", "AppleExecutableBinaryInfo", "linking_support")
load(":common/objc/objc_info.bzl", "ObjcInfo")
load(":common/xcode/providers.bzl", "XcodeVersionInfo", "XcodeVersionPropertiesInfo")
native_apple_common = _builtins.internal.apple_common
+native_objc_internal = _builtins.internal.objc_internal
apple_common = struct(
apple_toolchain = lambda: apple_toolchain,
@@ -41,4 +43,10 @@
link_multi_arch_binary = linking_support.link_multi_arch_binary,
link_multi_arch_static_library = linking_support.link_multi_arch_static_library,
dotted_version = lambda version: native_apple_common.dotted_version(version),
+ apple_platform = apple_platform,
+ compilation_support = compilation_support,
+ get_cpu = lambda config: native_objc_internal.get_cpu(config),
+ get_apple_config = lambda config: native_objc_internal.get_apple_config(config),
+ get_split_build_configs = lambda ctx: native_objc_internal.get_split_build_configs(ctx),
+ get_split_prerequisites = lambda ctx: native_objc_internal.get_split_prerequisites(ctx),
)
