Delete obsolete xcrunwrapper attribute and flag All uses have been cleaned up. PiperOrigin-RevId: 551544853 Change-Id: I549119401a1bcf4655c3cb23c03aa35dba88107d
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/MockObjcSupport.java b/src/test/java/com/google/devtools/build/lib/packages/util/MockObjcSupport.java index 736cfa3..03a5ae7 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/util/MockObjcSupport.java +++ b/src/test/java/com/google/devtools/build/lib/packages/util/MockObjcSupport.java
@@ -173,9 +173,7 @@ " ],", ")"); - for (String tool : - ImmutableSet.of( - "objc_dummy.mm", "gcov", "testrunner", "xcrunwrapper.sh", "mcov", "libtool")) { + for (String tool : ImmutableSet.of("objc_dummy.mm", "gcov", "testrunner", "mcov", "libtool")) { config.create(TestConstants.TOOLS_REPOSITORY_SCRATCH + "tools/objc/" + tool); } config.create( @@ -183,7 +181,6 @@ "package(default_visibility=['//visibility:public'])", "exports_files(glob(['**']))", "filegroup(name = 'default_provisioning_profile', srcs = ['foo.mobileprovision'])", - "sh_binary(name = 'xcrunwrapper', srcs = ['xcrunwrapper.sh'])", "filegroup(name = 'xctest_infoplist', srcs = ['xctest.plist'])", "py_binary(", " name = 'j2objc_dead_code_pruner_binary',",
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java index 8e43eeb..8cf81e0 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java
@@ -83,8 +83,6 @@ public abstract class ObjcRuleTestCase extends BuildViewTestCase { private static final Correspondence<String, String> MATCHES_REGEX = Correspondence.from((a, b) -> Pattern.matches(b, a), "matches"); - protected static final String MOCK_XCRUNWRAPPER_EXECUTABLE_PATH = - toolExecutable("tools/objc/xcrunwrapper"); protected static final ImmutableList<String> FASTBUILD_COPTS = ImmutableList.of("-O0", "-DDEBUG"); protected static final DottedVersion DEFAULT_IOS_SDK_VERSION = @@ -167,12 +165,6 @@ .getBaseName(); } - private static String toolExecutable(String toolSrcPath) { - return String.format( - "%s-out/[^/]*-exec-[^/]*/bin/%s", - TestConstants.PRODUCT_NAME, TestConstants.TOOLS_REPOSITORY_PATH_PREFIX + toolSrcPath); - } - @SuppressWarnings("MissingCasesInEnumSwitch") private String configurationDir( String arch, @@ -629,10 +621,6 @@ " '_xcode_config': attr.label(", " default=configuration_field(", " fragment='apple', name='xcode_config_label'),),", - " '_xcrunwrapper': attr.label(", - " executable=True,", - " cfg='exec',", - " default=Label('" + toolsLoc + ":xcrunwrapper')),", " 'additional_linker_inputs': attr.label_list(", " allow_files = True,", " ),",
diff --git a/src/test/shell/bazel/apple/apple_common.sh b/src/test/shell/bazel/apple/apple_common.sh index 0207023..2de665c 100644 --- a/src/test/shell/bazel/apple/apple_common.sh +++ b/src/test/shell/bazel/apple/apple_common.sh
@@ -79,11 +79,6 @@ name = "xcode_config_label", ), ), - "_xcrunwrapper": attr.label( - cfg = "exec", - default = Label("@bazel_tools//tools/objc:xcrunwrapper"), - executable = True, - ), "binary_type": attr.string(default = "executable"), "bundle_loader": attr.label(), "deps": attr.label_list( @@ -174,11 +169,6 @@ name = "xcode_config_label", ), ), - '_xcrunwrapper': attr.label( - executable = True, - cfg = 'exec', - default = Label("@bazel_tools//tools/objc:xcrunwrapper"), - ), 'additional_linker_inputs': attr.label_list( allow_files = True, ),
diff --git a/tools/objc/j2objc_dead_code_pruner_binary.py b/tools/objc/j2objc_dead_code_pruner_binary.py index f5e6f5c..626c83c 100755 --- a/tools/objc/j2objc_dead_code_pruner_binary.py +++ b/tools/objc/j2objc_dead_code_pruner_binary.py
@@ -476,9 +476,6 @@ '--entry_classes', help=('The comma-separated list of Java entry classes to be used as entry' ' point of the dead code analysis.')) - parser.add_argument( - '--xcrunwrapper', help='The xcrun wrapper script (legacy, unused).' - ) args = parser.parse_args()