Move xcrunwrapper and libtool to third_party/bazel/tools/objc from th…

…eir xcode src directories

There's no value in having these copied over from src/tools to tools/objc separately.

RELNOTES: None.
PiperOrigin-RevId: 153060955

src/BUILD

@@ -76,12 +76,9 @@ genrule(
 OSX_DUMMY_TARGETS = [
     "src/tools/xcode/actoolwrapper/actoolwrapper",
     "src/tools/xcode/ibtoolwrapper/ibtoolwrapper",
-    "src/tools/xcode/libtool/libtool",
-    "src/tools/xcode/libtool/make_hashed_objlist.py",
     "src/tools/xcode/momcwrapper/momcwrapper",
     "src/tools/xcode/swiftstdlibtoolwrapper/swiftstdlibtoolwrapper",
     "src/tools/xcode/environment/environment_plist",
-    "src/tools/xcode/xcrunwrapper/xcrunwrapper",
     "src/objc_tools/bundlemerge/bundlemerge_deploy.jar",
     "src/objc_tools/plmerge/plmerge_deploy.jar",
     "src/objc_tools/xcodegen/xcodegen_deploy.jar",
@@ -104,11 +101,9 @@ filegroup(
     srcs = [
         "//src/tools/xcode/actoolwrapper:actoolwrapper",
         "//src/tools/xcode/ibtoolwrapper:ibtoolwrapper",
-        "//src/tools/xcode/libtool:libtool_srcs",
         "//src/tools/xcode/momcwrapper:momcwrapper",
         "//src/tools/xcode/swiftstdlibtoolwrapper:swiftstdlibtoolwrapper",
         "//src/tools/xcode/environment:environment_plist",
-        "//src/tools/xcode/xcrunwrapper:xcrunwrapper",
         "//src/objc_tools/bundlemerge:bundlemerge_deploy.jar",
         "//src/objc_tools/plmerge:plmerge_deploy.jar",
         "//src/objc_tools/xcodegen:xcodegen_deploy.jar",
@@ -356,13 +351,11 @@ filegroup(
         "//src/tools/xcode/actoolwrapper:srcs",
         "//src/tools/xcode/environment:srcs",
         "//src/tools/xcode/ibtoolwrapper:srcs",
-        "//src/tools/xcode/libtool:srcs",
         "//src/tools/xcode/momcwrapper:srcs",
         "//src/tools/xcode/realpath:srcs",
         "//src/tools/singlejar:srcs",
         "//src/tools/xcode/stdredirect:srcs",
         "//src/tools/xcode/swiftstdlibtoolwrapper:srcs",
-        "//src/tools/xcode/xcrunwrapper:srcs",
         "//src/tools/xcode-common:srcs",
         "//src/tools/remote_worker:srcs",
         "//tools/osx:srcs",

src/create_embedded_tools.sh

@@ -30,15 +30,6 @@ trap "rm -fr \"${PACKAGE_DIR}\"" EXIT
 
 for i in $*; do
 
-  # Xcode tools should come from src/tools/xcode/.  Exclude scripts in
-  # tools/objc to avoid conflict.
-  if  [ "$i" = "tools/objc/xcrunwrapper.sh" ] \
-    || [ "$i" = "tools/objc/libtool.sh" ] \
-    || [ "$i" = "tools/objc/make_hashed_objlist.py" ]
-  then
-    continue
-  fi
-
   case "$i" in
     *tools/jdk/BUILD*) OUTPUT_PATH=tools/jdk/BUILD ;;
     *tools/platforms/platforms.BUILD) OUTPUT_PATH=platforms/BUILD ;;

src/test/shell/bazel/apple/BUILD

@@ -22,12 +22,10 @@ filegroup(
             "//src/tools/xcode/actoolwrapper",
             "//src/tools/xcode/environment:environment_plist",
             "//src/tools/xcode/ibtoolwrapper",
-            "//src/tools/xcode/libtool",
             "//src/tools/xcode/momcwrapper",
             "//src/tools/xcode/realpath",
             "//src/tools/xcode/stdredirect:StdRedirect.dylib",
             "//src/tools/xcode/swiftstdlibtoolwrapper",
-            "//src/tools/xcode/xcrunwrapper",
             "//tools/osx:xcode-locator",
         ],
         "//conditions:default": [],

src/tools/xcode/actoolwrapper/BUILD

@@ -10,6 +10,6 @@ sh_binary(
     srcs = ["actoolwrapper.sh"],
     data = [
         "//src/tools/xcode/realpath",
-        "//src/tools/xcode/xcrunwrapper",
+        "//tools/objc:xcrunwrapper",
     ],
 )

src/tools/xcode/ibtoolwrapper/BUILD

@@ -10,6 +10,6 @@ sh_binary(
     srcs = ["ibtoolwrapper.sh"],
     data = [
         "//src/tools/xcode/realpath",
-        "//src/tools/xcode/xcrunwrapper",
+        "//tools/objc:xcrunwrapper",
     ],
 )

src/tools/xcode/momcwrapper/BUILD

@@ -10,6 +10,6 @@ sh_binary(
     srcs = ["momcwrapper.sh"],
     data = [
         "//src/tools/xcode/realpath",
-        "//src/tools/xcode/xcrunwrapper",
+        "//tools/objc:xcrunwrapper",
     ],
 )

src/tools/xcode/swiftstdlibtoolwrapper/BUILD

@@ -10,6 +10,6 @@ sh_binary(
     srcs = ["swiftstdlibtoolwrapper.sh"],
     data = [
         "//src/tools/xcode/realpath",
-        "//src/tools/xcode/xcrunwrapper",
+        "//tools/objc:xcrunwrapper",
     ],
 )