Fix build_targets in xcschemes to accept string labels (#2864)

Signed-off-by: Brentley Jones <[email protected]>

Author: brentleyjones

tools/BUILD

@@ -108,7 +108,7 @@ _XCSCHEMES = [
         ),
         run = xcschemes.run(
             build_targets = [
-                xcschemes.top_level_build_target(_TOOLS["import_indexstores"]),
+                _TOOLS["import_indexstores"],
             ],
             diagnostics = _XCSCHEME_DIAGNOSTICS,
             launch_target = xcschemes.launch_target(
@@ -276,7 +276,7 @@ _XCSCHEMES = [
         ),
         run = xcschemes.run(
             build_targets = [
-                xcschemes.top_level_build_target(_TOOLS["swiftc_stub"]),
+                _TOOLS["swiftc_stub"],
             ],
             diagnostics = _XCSCHEME_DIAGNOSTICS,
             launch_target = xcschemes.launch_target(

xcodeproj/internal/xcschemes/xcscheme_labels.bzl

@@ -7,6 +7,9 @@ load(
 )
 
 def _resolve_build_target_labels(build_target):
+    if type(build_target) == "string":
+        return _resolve_label(build_target)
+
     return struct(
         extension_host = _resolve_label(build_target.extension_host),
         include = build_target.include,
@@ -23,6 +26,7 @@ def _resolve_build_target_labels(build_target):
 def _resolve_label(label_str):
     if not label_str:
         return ""
+
     return str(native.package_relative_label(label_str))
 
 def _resolve_labels(schemes):