Use actions.args() for handling remaining actions.run* arguments. (#2779)

PiperOrigin-RevId: 803012867

Cherry-pick:
8071945

Co-authored-by: Nicholas Levin <[email protected]>

Author: luispadron

apple/internal/partials/swift_dylibs.bzl

@@ -85,25 +85,22 @@ def _swift_dylib_action(
         strip_bitcode,
         swift_stdlib_tool):
     """Registers a swift-stlib-tool action to gather Swift dylibs to bundle."""
-    swift_stdlib_tool_args = [
-        "--platform",
-        platform_name,
-        "--output_path",
-        output_dir.path,
-    ]
-    for x in binary_files:
-        swift_stdlib_tool_args.extend([
-            "--binary",
-            x.path,
-        ])
+
+    swift_stdlib_tool_args = actions.args()
+    swift_stdlib_tool_args.add("--platform", platform_name)
+    swift_stdlib_tool_args.add("--output_path", output_dir.path)
+    swift_stdlib_tool_args.add_all(
+        binary_files,
+        before_each = "--binary",
+    )
 
     if strip_bitcode:
-        swift_stdlib_tool_args.append("--strip_bitcode")
+        swift_stdlib_tool_args.add("--strip_bitcode")
 
     apple_support.run(
         actions = actions,
         apple_fragment = platform_prerequisites.apple_fragment,
-        arguments = swift_stdlib_tool_args,
+        arguments = [swift_stdlib_tool_args],
         executable = swift_stdlib_tool,
         inputs = binary_files,
         mnemonic = "SwiftStdlibCopy",

apple/internal/resource_actions/BUILD

@@ -17,7 +17,6 @@ bzl_library(
         "//apple:utils",
         "//apple/internal:apple_product_type",
         "//apple/internal/utils:xctoolrunner",
-        "@bazel_skylib//lib:collections",
         "@bazel_skylib//lib:paths",
         "@bazel_skylib//lib:sets",
         "@build_bazel_apple_support//lib:apple_support",
@@ -56,7 +55,6 @@ bzl_library(
     ],
     deps = [
         "//apple/internal/utils:xctoolrunner",
-        "@bazel_skylib//lib:collections",
         "@bazel_skylib//lib:paths",
         "@build_bazel_apple_support//lib:apple_support",
     ],

apple/internal/resource_actions/actool.bzl

@@ -14,10 +14,6 @@
 
 """ACTool related actions."""
 
-load(
-    "@bazel_skylib//lib:collections.bzl",
-    "collections",
-)
 load(
     "@bazel_skylib//lib:paths.bzl",
     "paths",
@@ -330,7 +326,8 @@ def compile_asset_catalog(
     platform = platform_prerequisites.platform
     actool_platform = platform.name_in_plist.lower()
 
-    args = [
+    args = actions.args()
+    args.add_all([
         "actool",
         "--compile",
         xctoolrunner_support.prefixed_path(output_dir.path),
@@ -344,7 +341,7 @@ def compile_asset_catalog(
         "--minimum-deployment-target",
         platform_prerequisites.minimum_os,
         "--compress-pngs",
-    ]
+    ])
 
     xcode_config = platform_prerequisites.xcode_version_config
 
@@ -353,19 +350,19 @@ def compile_asset_catalog(
     ):
         # Required for the Icon Composer .icon bundles to work as inputs, even though it's not
         # documented. Xcode 26 currently relies on this flag to be set.
-        args.extend(["--lightweight-asset-runtime-mode", "enabled"])
+        args.add_all(["--lightweight-asset-runtime-mode", "enabled"])
 
-    args.extend(_actool_args_for_special_file_types(
+    args.add_all(_actool_args_for_special_file_types(
         asset_files = asset_files,
         bundle_id = bundle_id,
         platform_prerequisites = platform_prerequisites,
         primary_icon_name = primary_icon_name,
         product_type = product_type,
     ))
-    args.extend(collections.before_each(
-        "--target-device",
+    args.add_all(
         platform_prerequisites.device_families,
-    ))
+        before_each = "--target-device",
+    )
 
     alticons_outputs = []
     actool_output_plist = None
@@ -383,7 +380,7 @@ def compile_asset_catalog(
             actool_output_plist = output_plist
 
         actool_outputs.append(actool_output_plist)
-        args.extend([
+        args.add_all([
             "--output-partial-info-plist",
             xctoolrunner_support.prefixed_path(actool_output_plist.path),
         ])
@@ -394,11 +391,11 @@ def compile_asset_catalog(
         attr = "asset_catalogs",
     ).keys()
 
-    args.extend([xctoolrunner_support.prefixed_path(xcasset) for xcasset in xcassets])
+    args.add_all([xctoolrunner_support.prefixed_path(xcasset) for xcasset in xcassets])
 
     apple_support.run(
         actions = actions,
-        arguments = args,
+        arguments = [args],
         apple_fragment = platform_prerequisites.apple_fragment,
         executable = xctoolrunner,
         execution_requirements = {"no-sandbox": "1"},

apple/internal/resource_actions/datamodel.bzl

@@ -86,15 +86,14 @@ def compile_mappingmodel(
         platform_prerequisites: Struct containing information on the platform being targeted.
         xctoolrunner: A files_to_run for the wrapper around the "xcrun" tool.
     """
-    args = [
-        "mapc",
-        xctoolrunner_support.prefixed_path(mappingmodel_path),
-        xctoolrunner_support.prefixed_path(output_file.path),
-    ]
+    args = actions.args()
+    args.add("mapc")
+    args.add(xctoolrunner_support.prefixed_path(mappingmodel_path))
+    args.add(xctoolrunner_support.prefixed_path(output_file.path))
 
     apple_support.run(
         actions = actions,
-        arguments = args,
+        arguments = [args],
         apple_fragment = platform_prerequisites.apple_fragment,
         executable = xctoolrunner,
         inputs = input_files,

apple/internal/resource_actions/ibtool.bzl

@@ -14,10 +14,6 @@
 
 """IBTool related actions."""
 
-load(
-    "@bazel_skylib//lib:collections.bzl",
-    "collections",
-)
 load(
     "@bazel_skylib//lib:paths.bzl",
     "paths",
@@ -31,28 +27,6 @@ load(
     xctoolrunner_support = "xctoolrunner",
 )
 
-def _ibtool_arguments(min_os, families):
-    """Returns common `ibtool` command line arguments.
-
-    This function returns the common arguments used by both xib and storyboard
-    compilation, as well as storyboard linking. Callers should add their own
-    arguments to the returned array for their specific purposes.
-
-    Args:
-      min_os: The minimum OS version to use when compiling interface files.
-      families: The families that should be supported by the compiled interfaces.
-
-    Returns:
-      An array of command-line arguments to pass to ibtool.
-    """
-    return [
-        "--minimum-deployment-target",
-        min_os,
-    ] + collections.before_each(
-        "--target-device",
-        families,
-    )
-
 def compile_storyboard(
         *,
         actions,
@@ -73,7 +47,8 @@ def compile_storyboard(
       xctoolrunner: A files_to_run for the wrapper around the "xcrun" tool.
     """
 
-    args = [
+    args = actions.args()
+    args.add_all([
         "ibtool",
         "--compilation-directory",
         xctoolrunner_support.prefixed_path(output_dir.dirname),
@@ -83,20 +58,24 @@ def compile_storyboard(
         "--auto-activate-custom-fonts",
         "--output-format",
         "human-readable-text",
-    ]
+    ])
 
     min_os = platform_prerequisites.minimum_os
     families = platform_prerequisites.device_families
-    args.extend(_ibtool_arguments(min_os, families))
-    args.extend([
+
+    # Standard ibtool options.
+    args.add("--minimum-deployment-target", min_os)
+    args.add_all(families, before_each = "--target-device")
+
+    args.add_all([
         "--module",
         swift_module,
         xctoolrunner_support.prefixed_path(input_file.path),
     ])
 
     apple_support.run(
         actions = actions,
-        arguments = args,
+        arguments = [args],
         apple_fragment = platform_prerequisites.apple_fragment,
         executable = xctoolrunner,
         execution_requirements = {"no-sandbox": "1"},
@@ -131,20 +110,25 @@ def link_storyboards(
     min_os = platform_prerequisites.minimum_os
     families = platform_prerequisites.device_families
 
-    args = [
+    args = actions.args()
+    args.add_all([
         "ibtool",
         "--link",
         xctoolrunner_support.prefixed_path(output_dir.path),
-    ]
-    args.extend(_ibtool_arguments(min_os, families))
-    args.extend([
+    ])
+
+    # Standard ibtool options.
+    args.add("--minimum-deployment-target", min_os)
+    args.add_all(families, before_each = "--target-device")
+
+    args.add_all([
         xctoolrunner_support.prefixed_path(f.path)
         for f in storyboardc_dirs
     ])
 
     apple_support.run(
         actions = actions,
-        arguments = args,
+        arguments = [args],
         apple_fragment = platform_prerequisites.apple_fragment,
         executable = xctoolrunner,
         execution_requirements = {"no-sandbox": "1"},
@@ -179,21 +163,26 @@ def compile_xib(
 
     nib_name = paths.replace_extension(paths.basename(input_file.short_path), ".nib")
 
-    args = [
+    args = actions.args()
+    args.add_all([
         "ibtool",
         "--compile",
         xctoolrunner_support.prefixed_path(paths.join(output_dir.path, nib_name)),
-    ]
-    args.extend(_ibtool_arguments(min_os, families))
-    args.extend([
+    ])
+
+    # Standard ibtool options.
+    args.add("--minimum-deployment-target", min_os)
+    args.add_all(families, before_each = "--target-device")
+
+    args.add_all([
         "--module",
         swift_module,
         xctoolrunner_support.prefixed_path(input_file.path),
     ])
 
     apple_support.run(
         actions = actions,
-        arguments = args,
+        arguments = [args],
         apple_fragment = platform_prerequisites.apple_fragment,
         executable = xctoolrunner,
         execution_requirements = {"no-sandbox": "1"},

apple/internal/resource_actions/mlmodel.bzl

@@ -41,19 +41,21 @@ def compile_mlmodel(
       platform_prerequisites: Struct containing information on the platform being targeted.
       xctoolrunner: A files_to_run for the wrapper around the "xcrun" tool.
     """
-    args = [
-        "coremlc",
-        "compile",
-        xctoolrunner_support.prefixed_path(input_file.path),
-        output_bundle.dirname,
+
+    args = actions.args()
+    args.add("coremlc")
+    args.add("compile")
+    args.add(xctoolrunner_support.prefixed_path(input_file.path))
+    args.add(output_bundle.dirname)
+    args.add(
         "--output-partial-info-plist",
         xctoolrunner_support.prefixed_path(output_plist.path),
-    ]
+    )
 
     apple_support.run(
         actions = actions,
         apple_fragment = platform_prerequisites.apple_fragment,
-        arguments = args,
+        arguments = [args],
         executable = xctoolrunner,
         inputs = [input_file],
         mnemonic = "MlmodelCompile",
@@ -86,29 +88,28 @@ def generate_mlmodel_sources(
 
     is_swift = language == "Swift"
 
-    arguments = [
-        "coremlc",
-        "generate",
-        xctoolrunner_support.prefixed_path(input_file.path),
-    ]
+    arguments = actions.args()
+    arguments.add("coremlc")
+    arguments.add("generate")
+    arguments.add(xctoolrunner_support.prefixed_path(input_file.path))
 
     outputs = []
     if is_swift:
-        arguments += [
+        arguments.add_all([
             "--public-access",
             "--language",
             "Swift",
             swift_output_src.dirname,
-        ]
+        ])
         outputs = [swift_output_src]
     else:
-        arguments.append(objc_output_src.dirname)
+        arguments.add(objc_output_src.dirname)
         outputs = [objc_output_src, objc_output_hdr]
 
     apple_support.run(
         actions = actions,
         apple_fragment = platform_prerequisites.apple_fragment,
-        arguments = arguments,
+        arguments = [arguments],
         executable = xctoolrunner,
         inputs = [input_file],
         mnemonic = "MlmodelGenerate",