Move dump_syms from //tools/objc to //tools/osx. This will allow it to be referenced from the crosstool without crossing package boundaries.

--
MOS_MIGRATED_REVID=117137594

5 files changed, 29 insertions, 18 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java
index d307c5bc05..c5594e60d9 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java
@@ -705,19 +705,20 @@ public class ObjcRuleClasses {
     @Override
     public RuleClass build(Builder builder, RuleDefinitionEnvironment env) {
       return builder
-          .add(attr("$dumpsyms", LABEL)
-          .cfg(HOST)
-          .singleArtifact()
-          .value(env.getToolsLabel("//tools/objc:dump_syms")))
-          .add(attr("$j2objc_dead_code_pruner", LABEL)
-              .allowedFileTypes(FileType.of(".py"))
-              .cfg(HOST)
-              .exec()
-              .singleArtifact()
-              .value(env.getToolsLabel("//tools/objc:j2objc_dead_code_pruner")))
-          .add(attr("$dummy_lib", LABEL)
-              .value(env.getToolsLabel("//tools/objc:dummy_lib")))
-        .build();
+          .add(
+              attr("$dumpsyms", LABEL)
+                  .cfg(HOST)
+                  .singleArtifact()
+                  .value(env.getToolsLabel("//tools/osx/crosstool:dump_syms")))
+          .add(
+              attr("$j2objc_dead_code_pruner", LABEL)
+                  .allowedFileTypes(FileType.of(".py"))
+                  .cfg(HOST)
+                  .exec()
+                  .singleArtifact()
+                  .value(env.getToolsLabel("//tools/objc:j2objc_dead_code_pruner")))
+          .add(attr("$dummy_lib", LABEL).value(env.getToolsLabel("//tools/objc:dummy_lib")))
+          .build();
     }
     @Override
     public Metadata getMetadata() {
diff --git a/tools/BUILD b/tools/BUILD
index 2282c29ae9..00211b095b 100644
--- a/tools/BUILD
+++ b/tools/BUILD
@@ -57,6 +57,7 @@ filegroup(
         "//tools/objc:srcs",
         "//tools/python:srcs",
         "//tools/test:srcs",
+        "//tools/osx/crosstool:srcs",
         "//tools/zip:srcs",
     ],
 )
diff --git a/tools/objc/BUILD b/tools/objc/BUILD
index a2690e8a60..3b690d312b 100644
--- a/tools/objc/BUILD
+++ b/tools/objc/BUILD
@@ -54,11 +54,6 @@ filegroup(
     srcs = [":memleaks_plugin_stub"],
 )
 
-filegroup(
-    name = "dump_syms",
-    srcs = [":dump_syms_stub"],
-)
-
 sh_binary(
     name = "ibtoolwrapper",
     srcs = [":ibtoolwrapper.sh"],
diff --git a/tools/osx/crosstool/BUILD b/tools/osx/crosstool/BUILD
new file mode 100644
index 0000000000..91649ba233
--- /dev/null
+++ b/tools/osx/crosstool/BUILD
@@ -0,0 +1,14 @@
+package(default_visibility = ["//visibility:public"])
+
+# Files which shouldn't be publicly visible and dependencies of all objc_* or ios_* rules shouldn't be in this package.
+exports_files(glob(["**"]))
+
+filegroup(
+    name = "dump_syms",
+    srcs = [":dump_syms_stub"],
+)
+
+filegroup(
+    name = "srcs",
+    srcs = glob(["**"]),
+)
diff --git a/tools/objc/dump_syms_stub b/tools/osx/crosstool/dump_syms_stub
index b17269010c..b17269010c 100644
--- a/tools/objc/dump_syms_stub
+++ b/tools/osx/crosstool/dump_syms_stub